diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }
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 f49dc26..3657cfd 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -95,17 +95,21 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            csi.measure_category AS measureCategory,
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             AND approval_status = #{request.approvalStatus}
-            AND create_user = #{request.createUserId}
+            AND bcr.create_user = #{request.createUserId}
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
@@ -131,15 +135,18 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }
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 f49dc26..3657cfd 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -95,17 +95,21 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            csi.measure_category AS measureCategory,
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             AND approval_status = #{request.approvalStatus}
-            AND create_user = #{request.createUserId}
+            AND bcr.create_user = #{request.createUserId}
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
@@ -131,15 +135,18 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
index b4d8744..247f3d6 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
@@ -30,9 +30,9 @@
 
     <select id="originListPage" resultType="com.casic.missiles.model.business.BusinessOriginalRecord">
         SELECT
-        <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
@@ -61,15 +61,15 @@
 
     <select id="originExportList" resultType="com.casic.missiles.dto.business.originRecord.OriginRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
-        cs.sample_no AS sampleNo,
-        cs.sample_name AS sampleName,
-        cs.sample_model AS sampleModel,
-        cs.manufacturing_no AS manufacturingNo,
-        su.name  AS createUserName
+            <include refid="Base_Column_List"/>,
+            cs.sample_no AS sampleNo,
+            cs.sample_name AS sampleName,
+            cs.sample_model AS sampleModel,
+            cs.manufacturing_no AS manufacturingNo,
+            su.name  AS createUserName
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
-        LEFT JOIN sys_user su ON su.id = bor.create_user
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN sys_user su ON su.id = bor.create_user
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }
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 f49dc26..3657cfd 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -95,17 +95,21 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            csi.measure_category AS measureCategory,
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             AND approval_status = #{request.approvalStatus}
-            AND create_user = #{request.createUserId}
+            AND bcr.create_user = #{request.createUserId}
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
@@ -131,15 +135,18 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
index b4d8744..247f3d6 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
@@ -30,9 +30,9 @@
 
     <select id="originListPage" resultType="com.casic.missiles.model.business.BusinessOriginalRecord">
         SELECT
-        <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
@@ -61,15 +61,15 @@
 
     <select id="originExportList" resultType="com.casic.missiles.dto.business.originRecord.OriginRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
-        cs.sample_no AS sampleNo,
-        cs.sample_name AS sampleName,
-        cs.sample_model AS sampleModel,
-        cs.manufacturing_no AS manufacturingNo,
-        su.name  AS createUserName
+            <include refid="Base_Column_List"/>,
+            cs.sample_no AS sampleNo,
+            cs.sample_name AS sampleName,
+            cs.sample_model AS sampleModel,
+            cs.manufacturing_no AS manufacturingNo,
+            su.name  AS createUserName
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
-        LEFT JOIN sys_user su ON su.id = bor.create_user
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN sys_user su ON su.id = bor.create_user
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
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 e67c097..f10fbb3 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,4 +7,23 @@
         FROM customer_sample_info
     </select>
 
+
+    <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
+        SELECT
+            csi.*
+        FROM customer_sample_info csi
+            LEFT JOIN business_order_sample_relation sr ON sr.sample_id = csi.id
+        WHERE csi.is_del =0
+            <if test="sampleNo != null and sampleNo !=''">
+                and csi.sample_no like concat('%', #{sampleNo}, '%')
+            </if>
+            <if test="sampleName != null and sampleName !=''">
+                and csi.sample_name like concat('%', #{sampleName}, '%')
+            </if>
+            <if test="orderId != null and orderId !=''">
+                and sr.order_id  = #{orderId}
+            </if>
+        ORDER BY csi.create_time DESC
+    </select>
+
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }
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 f49dc26..3657cfd 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -95,17 +95,21 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            csi.measure_category AS measureCategory,
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             AND approval_status = #{request.approvalStatus}
-            AND create_user = #{request.createUserId}
+            AND bcr.create_user = #{request.createUserId}
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
@@ -131,15 +135,18 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
index b4d8744..247f3d6 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
@@ -30,9 +30,9 @@
 
     <select id="originListPage" resultType="com.casic.missiles.model.business.BusinessOriginalRecord">
         SELECT
-        <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
@@ -61,15 +61,15 @@
 
     <select id="originExportList" resultType="com.casic.missiles.dto.business.originRecord.OriginRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
-        cs.sample_no AS sampleNo,
-        cs.sample_name AS sampleName,
-        cs.sample_model AS sampleModel,
-        cs.manufacturing_no AS manufacturingNo,
-        su.name  AS createUserName
+            <include refid="Base_Column_List"/>,
+            cs.sample_no AS sampleNo,
+            cs.sample_name AS sampleName,
+            cs.sample_model AS sampleModel,
+            cs.manufacturing_no AS manufacturingNo,
+            su.name  AS createUserName
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
-        LEFT JOIN sys_user su ON su.id = bor.create_user
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN sys_user su ON su.id = bor.create_user
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
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 e67c097..f10fbb3 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,4 +7,23 @@
         FROM customer_sample_info
     </select>
 
+
+    <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
+        SELECT
+            csi.*
+        FROM customer_sample_info csi
+            LEFT JOIN business_order_sample_relation sr ON sr.sample_id = csi.id
+        WHERE csi.is_del =0
+            <if test="sampleNo != null and sampleNo !=''">
+                and csi.sample_no like concat('%', #{sampleNo}, '%')
+            </if>
+            <if test="sampleName != null and sampleName !=''">
+                and csi.sample_name like concat('%', #{sampleName}, '%')
+            </if>
+            <if test="orderId != null and orderId !=''">
+                and sr.order_id  = #{orderId}
+            </if>
+        ORDER BY csi.create_time DESC
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index f9f4490..b43617c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -6,6 +6,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -74,6 +75,8 @@
     @ApiModelProperty(value = "检定人员", dataType = "String")
     private String measurePersonId;
 
+    @ApiModelProperty(value = "检定人员名称", dataType = "String")
+    private String measurePersonName;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@@ -84,6 +87,7 @@
 //
 //    private Long createUser;
 //
+    @ApiModelProperty(value = "创建时间", dataType = "String")
     private String createTime;
 
 
@@ -112,4 +116,11 @@
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
+    @ApiModelProperty(value = "校验类别id", dataType = "String")
+    private String measureCategory;
+
+    @ApiModelProperty(value = "校验类别名称", dataType = "String")
+    private String measureCategoryName;
+
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }
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 f49dc26..3657cfd 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -95,17 +95,21 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            csi.measure_category AS measureCategory,
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             AND approval_status = #{request.approvalStatus}
-            AND create_user = #{request.createUserId}
+            AND bcr.create_user = #{request.createUserId}
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
@@ -131,15 +135,18 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
index b4d8744..247f3d6 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
@@ -30,9 +30,9 @@
 
     <select id="originListPage" resultType="com.casic.missiles.model.business.BusinessOriginalRecord">
         SELECT
-        <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
@@ -61,15 +61,15 @@
 
     <select id="originExportList" resultType="com.casic.missiles.dto.business.originRecord.OriginRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
-        cs.sample_no AS sampleNo,
-        cs.sample_name AS sampleName,
-        cs.sample_model AS sampleModel,
-        cs.manufacturing_no AS manufacturingNo,
-        su.name  AS createUserName
+            <include refid="Base_Column_List"/>,
+            cs.sample_no AS sampleNo,
+            cs.sample_name AS sampleName,
+            cs.sample_model AS sampleModel,
+            cs.manufacturing_no AS manufacturingNo,
+            su.name  AS createUserName
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
-        LEFT JOIN sys_user su ON su.id = bor.create_user
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN sys_user su ON su.id = bor.create_user
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
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 e67c097..f10fbb3 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,4 +7,23 @@
         FROM customer_sample_info
     </select>
 
+
+    <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
+        SELECT
+            csi.*
+        FROM customer_sample_info csi
+            LEFT JOIN business_order_sample_relation sr ON sr.sample_id = csi.id
+        WHERE csi.is_del =0
+            <if test="sampleNo != null and sampleNo !=''">
+                and csi.sample_no like concat('%', #{sampleNo}, '%')
+            </if>
+            <if test="sampleName != null and sampleName !=''">
+                and csi.sample_name like concat('%', #{sampleName}, '%')
+            </if>
+            <if test="orderId != null and orderId !=''">
+                and sr.order_id  = #{orderId}
+            </if>
+        ORDER BY csi.create_time DESC
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index f9f4490..b43617c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -6,6 +6,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -74,6 +75,8 @@
     @ApiModelProperty(value = "检定人员", dataType = "String")
     private String measurePersonId;
 
+    @ApiModelProperty(value = "检定人员名称", dataType = "String")
+    private String measurePersonName;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@@ -84,6 +87,7 @@
 //
 //    private Long createUser;
 //
+    @ApiModelProperty(value = "创建时间", dataType = "String")
     private String createTime;
 
 
@@ -112,4 +116,11 @@
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
+    @ApiModelProperty(value = "校验类别id", dataType = "String")
+    private String measureCategory;
+
+    @ApiModelProperty(value = "校验类别名称", dataType = "String")
+    private String measureCategoryName;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
index 01759aa..d2c2ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
@@ -31,6 +31,9 @@
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUser;
 
+    @ApiModelProperty(value = "原始记录单id", dataType = "Long")
+    private Long id;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }
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 f49dc26..3657cfd 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -95,17 +95,21 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            csi.measure_category AS measureCategory,
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             AND approval_status = #{request.approvalStatus}
-            AND create_user = #{request.createUserId}
+            AND bcr.create_user = #{request.createUserId}
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
@@ -131,15 +135,18 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
index b4d8744..247f3d6 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
@@ -30,9 +30,9 @@
 
     <select id="originListPage" resultType="com.casic.missiles.model.business.BusinessOriginalRecord">
         SELECT
-        <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
@@ -61,15 +61,15 @@
 
     <select id="originExportList" resultType="com.casic.missiles.dto.business.originRecord.OriginRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
-        cs.sample_no AS sampleNo,
-        cs.sample_name AS sampleName,
-        cs.sample_model AS sampleModel,
-        cs.manufacturing_no AS manufacturingNo,
-        su.name  AS createUserName
+            <include refid="Base_Column_List"/>,
+            cs.sample_no AS sampleNo,
+            cs.sample_name AS sampleName,
+            cs.sample_model AS sampleModel,
+            cs.manufacturing_no AS manufacturingNo,
+            su.name  AS createUserName
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
-        LEFT JOIN sys_user su ON su.id = bor.create_user
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN sys_user su ON su.id = bor.create_user
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
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 e67c097..f10fbb3 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,4 +7,23 @@
         FROM customer_sample_info
     </select>
 
+
+    <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
+        SELECT
+            csi.*
+        FROM customer_sample_info csi
+            LEFT JOIN business_order_sample_relation sr ON sr.sample_id = csi.id
+        WHERE csi.is_del =0
+            <if test="sampleNo != null and sampleNo !=''">
+                and csi.sample_no like concat('%', #{sampleNo}, '%')
+            </if>
+            <if test="sampleName != null and sampleName !=''">
+                and csi.sample_name like concat('%', #{sampleName}, '%')
+            </if>
+            <if test="orderId != null and orderId !=''">
+                and sr.order_id  = #{orderId}
+            </if>
+        ORDER BY csi.create_time DESC
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index f9f4490..b43617c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -6,6 +6,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -74,6 +75,8 @@
     @ApiModelProperty(value = "检定人员", dataType = "String")
     private String measurePersonId;
 
+    @ApiModelProperty(value = "检定人员名称", dataType = "String")
+    private String measurePersonName;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@@ -84,6 +87,7 @@
 //
 //    private Long createUser;
 //
+    @ApiModelProperty(value = "创建时间", dataType = "String")
     private String createTime;
 
 
@@ -112,4 +116,11 @@
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
+    @ApiModelProperty(value = "校验类别id", dataType = "String")
+    private String measureCategory;
+
+    @ApiModelProperty(value = "校验类别名称", dataType = "String")
+    private String measureCategoryName;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
index 01759aa..d2c2ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
@@ -31,6 +31,9 @@
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUser;
 
+    @ApiModelProperty(value = "原始记录单id", dataType = "Long")
+    private Long id;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
index 201dc35..792e0fe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
@@ -154,4 +154,8 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "检校类别名称", dataType = "String")
     private String measureCategoryName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "原始记录模板名称", dataType = "String")
+    private String templateName;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }
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 f49dc26..3657cfd 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -95,17 +95,21 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            csi.measure_category AS measureCategory,
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             AND approval_status = #{request.approvalStatus}
-            AND create_user = #{request.createUserId}
+            AND bcr.create_user = #{request.createUserId}
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
@@ -131,15 +135,18 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
index b4d8744..247f3d6 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
@@ -30,9 +30,9 @@
 
     <select id="originListPage" resultType="com.casic.missiles.model.business.BusinessOriginalRecord">
         SELECT
-        <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
@@ -61,15 +61,15 @@
 
     <select id="originExportList" resultType="com.casic.missiles.dto.business.originRecord.OriginRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
-        cs.sample_no AS sampleNo,
-        cs.sample_name AS sampleName,
-        cs.sample_model AS sampleModel,
-        cs.manufacturing_no AS manufacturingNo,
-        su.name  AS createUserName
+            <include refid="Base_Column_List"/>,
+            cs.sample_no AS sampleNo,
+            cs.sample_name AS sampleName,
+            cs.sample_model AS sampleModel,
+            cs.manufacturing_no AS manufacturingNo,
+            su.name  AS createUserName
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
-        LEFT JOIN sys_user su ON su.id = bor.create_user
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN sys_user su ON su.id = bor.create_user
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
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 e67c097..f10fbb3 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,4 +7,23 @@
         FROM customer_sample_info
     </select>
 
+
+    <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
+        SELECT
+            csi.*
+        FROM customer_sample_info csi
+            LEFT JOIN business_order_sample_relation sr ON sr.sample_id = csi.id
+        WHERE csi.is_del =0
+            <if test="sampleNo != null and sampleNo !=''">
+                and csi.sample_no like concat('%', #{sampleNo}, '%')
+            </if>
+            <if test="sampleName != null and sampleName !=''">
+                and csi.sample_name like concat('%', #{sampleName}, '%')
+            </if>
+            <if test="orderId != null and orderId !=''">
+                and sr.order_id  = #{orderId}
+            </if>
+        ORDER BY csi.create_time DESC
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index f9f4490..b43617c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -6,6 +6,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -74,6 +75,8 @@
     @ApiModelProperty(value = "检定人员", dataType = "String")
     private String measurePersonId;
 
+    @ApiModelProperty(value = "检定人员名称", dataType = "String")
+    private String measurePersonName;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@@ -84,6 +87,7 @@
 //
 //    private Long createUser;
 //
+    @ApiModelProperty(value = "创建时间", dataType = "String")
     private String createTime;
 
 
@@ -112,4 +116,11 @@
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
+    @ApiModelProperty(value = "校验类别id", dataType = "String")
+    private String measureCategory;
+
+    @ApiModelProperty(value = "校验类别名称", dataType = "String")
+    private String measureCategoryName;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
index 01759aa..d2c2ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
@@ -31,6 +31,9 @@
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUser;
 
+    @ApiModelProperty(value = "原始记录单id", dataType = "Long")
+    private Long id;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
index 201dc35..792e0fe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
@@ -154,4 +154,8 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "检校类别名称", dataType = "String")
     private String measureCategoryName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "原始记录模板名称", dataType = "String")
+    private String templateName;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index c43341f..d03ab22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -306,6 +306,8 @@
         approvalList.forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
             approval.setApprovalStatus(taskMap.get(String.valueOf(approval.getId())));
+            approval.setMeasureCategoryName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_CATEGORY, approval.getMeasureCategory()));
+
         });
         //排序
         return approvalList.stream().sorted(Comparator.comparing(CertificateReportResponse::getCreateTime).reversed()).collect(Collectors.toList());
@@ -315,6 +317,7 @@
         approvalList.stream().forEach(result -> {
             //审批状态两种获取方式：1、在此处设置，2、在flowable中设置业务状态，暂采取1
             result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, status));
+            result.setMeasureCategoryName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_CATEGORY, result.getMeasureCategory()));
         });
         return approvalList;
     }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }
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 f49dc26..3657cfd 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -95,17 +95,21 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            csi.measure_category AS measureCategory,
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             AND approval_status = #{request.approvalStatus}
-            AND create_user = #{request.createUserId}
+            AND bcr.create_user = #{request.createUserId}
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
@@ -131,15 +135,18 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
index b4d8744..247f3d6 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
@@ -30,9 +30,9 @@
 
     <select id="originListPage" resultType="com.casic.missiles.model.business.BusinessOriginalRecord">
         SELECT
-        <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
@@ -61,15 +61,15 @@
 
     <select id="originExportList" resultType="com.casic.missiles.dto.business.originRecord.OriginRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
-        cs.sample_no AS sampleNo,
-        cs.sample_name AS sampleName,
-        cs.sample_model AS sampleModel,
-        cs.manufacturing_no AS manufacturingNo,
-        su.name  AS createUserName
+            <include refid="Base_Column_List"/>,
+            cs.sample_no AS sampleNo,
+            cs.sample_name AS sampleName,
+            cs.sample_model AS sampleModel,
+            cs.manufacturing_no AS manufacturingNo,
+            su.name  AS createUserName
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
-        LEFT JOIN sys_user su ON su.id = bor.create_user
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN sys_user su ON su.id = bor.create_user
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
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 e67c097..f10fbb3 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,4 +7,23 @@
         FROM customer_sample_info
     </select>
 
+
+    <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
+        SELECT
+            csi.*
+        FROM customer_sample_info csi
+            LEFT JOIN business_order_sample_relation sr ON sr.sample_id = csi.id
+        WHERE csi.is_del =0
+            <if test="sampleNo != null and sampleNo !=''">
+                and csi.sample_no like concat('%', #{sampleNo}, '%')
+            </if>
+            <if test="sampleName != null and sampleName !=''">
+                and csi.sample_name like concat('%', #{sampleName}, '%')
+            </if>
+            <if test="orderId != null and orderId !=''">
+                and sr.order_id  = #{orderId}
+            </if>
+        ORDER BY csi.create_time DESC
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index f9f4490..b43617c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -6,6 +6,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -74,6 +75,8 @@
     @ApiModelProperty(value = "检定人员", dataType = "String")
     private String measurePersonId;
 
+    @ApiModelProperty(value = "检定人员名称", dataType = "String")
+    private String measurePersonName;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@@ -84,6 +87,7 @@
 //
 //    private Long createUser;
 //
+    @ApiModelProperty(value = "创建时间", dataType = "String")
     private String createTime;
 
 
@@ -112,4 +116,11 @@
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
+    @ApiModelProperty(value = "校验类别id", dataType = "String")
+    private String measureCategory;
+
+    @ApiModelProperty(value = "校验类别名称", dataType = "String")
+    private String measureCategoryName;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
index 01759aa..d2c2ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
@@ -31,6 +31,9 @@
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUser;
 
+    @ApiModelProperty(value = "原始记录单id", dataType = "Long")
+    private Long id;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
index 201dc35..792e0fe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
@@ -154,4 +154,8 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "检校类别名称", dataType = "String")
     private String measureCategoryName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "原始记录模板名称", dataType = "String")
+    private String templateName;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index c43341f..d03ab22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -306,6 +306,8 @@
         approvalList.forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
             approval.setApprovalStatus(taskMap.get(String.valueOf(approval.getId())));
+            approval.setMeasureCategoryName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_CATEGORY, approval.getMeasureCategory()));
+
         });
         //排序
         return approvalList.stream().sorted(Comparator.comparing(CertificateReportResponse::getCreateTime).reversed()).collect(Collectors.toList());
@@ -315,6 +317,7 @@
         approvalList.stream().forEach(result -> {
             //审批状态两种获取方式：1、在此处设置，2、在flowable中设置业务状态，暂采取1
             result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, status));
+            result.setMeasureCategoryName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_CATEGORY, result.getMeasureCategory()));
         });
         return approvalList;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
index 046e4aa..1e35b7a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
@@ -17,8 +17,11 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
+import com.casic.missiles.model.system.SystemTemplate;
 import com.casic.missiles.service.business.*;
 import com.casic.missiles.service.customer.CustomerSampleService;
+import com.casic.missiles.service.system.ISystemTemplateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.springframework.stereotype.Service;
@@ -27,7 +30,6 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -54,6 +56,9 @@
     private IBusinessOriginalRecordEquipmentRelationService originalRecordEquipmentRelationService;
     @Resource
     private IBaseExportService iBaseExportService;
+    @Resource
+    private ISystemTemplateService templateService;
+
 
     @Override
     public Page<BusinessOriginalRecord> originListPage(Page<BusinessOriginalRecord> page, OriginRecordRequest request) throws Exception {
@@ -71,6 +76,11 @@
     }
 
     @Override
+    public Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> sampleInfoPage, OriginRecordRequest request) {
+        return customerSampleService.samplesByOderId(sampleInfoPage, request.getId(), request.getSampleNo(), request.getSampleName());
+    }
+
+    @Override
     public BusinessOriginalRecord originalDetail(Long id) throws Exception {
         BusinessOriginalRecord businessOriginalRecord = this.baseMapper.selectById(id);
         if (businessOriginalRecord != null) {
@@ -94,6 +104,14 @@
 
             //字典值转换
             DictCodeUtils.convertDictCodeToName(businessOriginalRecord);
+
+            //显示模板名称
+            if (null != businessOriginalRecord.getTemplateId()) {
+                SystemTemplate systemTemplate = templateService.getById(businessOriginalRecord.getTemplateId());
+                if (systemTemplate != null) {
+                    businessOriginalRecord.setTemplateName(systemTemplate.getTemplateName());
+                }
+            }
         }
         return businessOriginalRecord;
     }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }
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 f49dc26..3657cfd 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -95,17 +95,21 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            csi.measure_category AS measureCategory,
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             AND approval_status = #{request.approvalStatus}
-            AND create_user = #{request.createUserId}
+            AND bcr.create_user = #{request.createUserId}
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
@@ -131,15 +135,18 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
index b4d8744..247f3d6 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
@@ -30,9 +30,9 @@
 
     <select id="originListPage" resultType="com.casic.missiles.model.business.BusinessOriginalRecord">
         SELECT
-        <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
@@ -61,15 +61,15 @@
 
     <select id="originExportList" resultType="com.casic.missiles.dto.business.originRecord.OriginRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
-        cs.sample_no AS sampleNo,
-        cs.sample_name AS sampleName,
-        cs.sample_model AS sampleModel,
-        cs.manufacturing_no AS manufacturingNo,
-        su.name  AS createUserName
+            <include refid="Base_Column_List"/>,
+            cs.sample_no AS sampleNo,
+            cs.sample_name AS sampleName,
+            cs.sample_model AS sampleModel,
+            cs.manufacturing_no AS manufacturingNo,
+            su.name  AS createUserName
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
-        LEFT JOIN sys_user su ON su.id = bor.create_user
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN sys_user su ON su.id = bor.create_user
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
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 e67c097..f10fbb3 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,4 +7,23 @@
         FROM customer_sample_info
     </select>
 
+
+    <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
+        SELECT
+            csi.*
+        FROM customer_sample_info csi
+            LEFT JOIN business_order_sample_relation sr ON sr.sample_id = csi.id
+        WHERE csi.is_del =0
+            <if test="sampleNo != null and sampleNo !=''">
+                and csi.sample_no like concat('%', #{sampleNo}, '%')
+            </if>
+            <if test="sampleName != null and sampleName !=''">
+                and csi.sample_name like concat('%', #{sampleName}, '%')
+            </if>
+            <if test="orderId != null and orderId !=''">
+                and sr.order_id  = #{orderId}
+            </if>
+        ORDER BY csi.create_time DESC
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index f9f4490..b43617c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -6,6 +6,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -74,6 +75,8 @@
     @ApiModelProperty(value = "检定人员", dataType = "String")
     private String measurePersonId;
 
+    @ApiModelProperty(value = "检定人员名称", dataType = "String")
+    private String measurePersonName;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@@ -84,6 +87,7 @@
 //
 //    private Long createUser;
 //
+    @ApiModelProperty(value = "创建时间", dataType = "String")
     private String createTime;
 
 
@@ -112,4 +116,11 @@
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
+    @ApiModelProperty(value = "校验类别id", dataType = "String")
+    private String measureCategory;
+
+    @ApiModelProperty(value = "校验类别名称", dataType = "String")
+    private String measureCategoryName;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
index 01759aa..d2c2ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
@@ -31,6 +31,9 @@
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUser;
 
+    @ApiModelProperty(value = "原始记录单id", dataType = "Long")
+    private Long id;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
index 201dc35..792e0fe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
@@ -154,4 +154,8 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "检校类别名称", dataType = "String")
     private String measureCategoryName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "原始记录模板名称", dataType = "String")
+    private String templateName;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index c43341f..d03ab22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -306,6 +306,8 @@
         approvalList.forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
             approval.setApprovalStatus(taskMap.get(String.valueOf(approval.getId())));
+            approval.setMeasureCategoryName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_CATEGORY, approval.getMeasureCategory()));
+
         });
         //排序
         return approvalList.stream().sorted(Comparator.comparing(CertificateReportResponse::getCreateTime).reversed()).collect(Collectors.toList());
@@ -315,6 +317,7 @@
         approvalList.stream().forEach(result -> {
             //审批状态两种获取方式：1、在此处设置，2、在flowable中设置业务状态，暂采取1
             result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, status));
+            result.setMeasureCategoryName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_CATEGORY, result.getMeasureCategory()));
         });
         return approvalList;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
index 046e4aa..1e35b7a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
@@ -17,8 +17,11 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
+import com.casic.missiles.model.system.SystemTemplate;
 import com.casic.missiles.service.business.*;
 import com.casic.missiles.service.customer.CustomerSampleService;
+import com.casic.missiles.service.system.ISystemTemplateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.springframework.stereotype.Service;
@@ -27,7 +30,6 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -54,6 +56,9 @@
     private IBusinessOriginalRecordEquipmentRelationService originalRecordEquipmentRelationService;
     @Resource
     private IBaseExportService iBaseExportService;
+    @Resource
+    private ISystemTemplateService templateService;
+
 
     @Override
     public Page<BusinessOriginalRecord> originListPage(Page<BusinessOriginalRecord> page, OriginRecordRequest request) throws Exception {
@@ -71,6 +76,11 @@
     }
 
     @Override
+    public Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> sampleInfoPage, OriginRecordRequest request) {
+        return customerSampleService.samplesByOderId(sampleInfoPage, request.getId(), request.getSampleNo(), request.getSampleName());
+    }
+
+    @Override
     public BusinessOriginalRecord originalDetail(Long id) throws Exception {
         BusinessOriginalRecord businessOriginalRecord = this.baseMapper.selectById(id);
         if (businessOriginalRecord != null) {
@@ -94,6 +104,14 @@
 
             //字典值转换
             DictCodeUtils.convertDictCodeToName(businessOriginalRecord);
+
+            //显示模板名称
+            if (null != businessOriginalRecord.getTemplateId()) {
+                SystemTemplate systemTemplate = templateService.getById(businessOriginalRecord.getTemplateId());
+                if (systemTemplate != null) {
+                    businessOriginalRecord.setTemplateName(systemTemplate.getTemplateName());
+                }
+            }
         }
         return businessOriginalRecord;
     }
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 3bbcaaf..4889e55 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
@@ -176,6 +176,11 @@
         return certificateResponsePage;
     }
 
+    @Override
+    public Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,Long orderId, String sampleNo, String sampleName) {
+        return this.baseMapper.samplesByOderId(page,orderId,sampleNo,sampleName);
+    }
+
     private BusinessOrderSampleRelation getSampleStatusById(Long sampleId) {
         QueryWrapper<BusinessOrderSampleRelation> wrapper = new QueryWrapper<BusinessOrderSampleRelation>()
                 .eq("sample_id", sampleId)

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }
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 f49dc26..3657cfd 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -95,17 +95,21 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            csi.measure_category AS measureCategory,
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             AND approval_status = #{request.approvalStatus}
-            AND create_user = #{request.createUserId}
+            AND bcr.create_user = #{request.createUserId}
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
@@ -131,15 +135,18 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
index b4d8744..247f3d6 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
@@ -30,9 +30,9 @@
 
     <select id="originListPage" resultType="com.casic.missiles.model.business.BusinessOriginalRecord">
         SELECT
-        <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
@@ -61,15 +61,15 @@
 
     <select id="originExportList" resultType="com.casic.missiles.dto.business.originRecord.OriginRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
-        cs.sample_no AS sampleNo,
-        cs.sample_name AS sampleName,
-        cs.sample_model AS sampleModel,
-        cs.manufacturing_no AS manufacturingNo,
-        su.name  AS createUserName
+            <include refid="Base_Column_List"/>,
+            cs.sample_no AS sampleNo,
+            cs.sample_name AS sampleName,
+            cs.sample_model AS sampleModel,
+            cs.manufacturing_no AS manufacturingNo,
+            su.name  AS createUserName
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
-        LEFT JOIN sys_user su ON su.id = bor.create_user
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN sys_user su ON su.id = bor.create_user
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
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 e67c097..f10fbb3 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,4 +7,23 @@
         FROM customer_sample_info
     </select>
 
+
+    <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
+        SELECT
+            csi.*
+        FROM customer_sample_info csi
+            LEFT JOIN business_order_sample_relation sr ON sr.sample_id = csi.id
+        WHERE csi.is_del =0
+            <if test="sampleNo != null and sampleNo !=''">
+                and csi.sample_no like concat('%', #{sampleNo}, '%')
+            </if>
+            <if test="sampleName != null and sampleName !=''">
+                and csi.sample_name like concat('%', #{sampleName}, '%')
+            </if>
+            <if test="orderId != null and orderId !=''">
+                and sr.order_id  = #{orderId}
+            </if>
+        ORDER BY csi.create_time DESC
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index f9f4490..b43617c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -6,6 +6,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -74,6 +75,8 @@
     @ApiModelProperty(value = "检定人员", dataType = "String")
     private String measurePersonId;
 
+    @ApiModelProperty(value = "检定人员名称", dataType = "String")
+    private String measurePersonName;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@@ -84,6 +87,7 @@
 //
 //    private Long createUser;
 //
+    @ApiModelProperty(value = "创建时间", dataType = "String")
     private String createTime;
 
 
@@ -112,4 +116,11 @@
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
+    @ApiModelProperty(value = "校验类别id", dataType = "String")
+    private String measureCategory;
+
+    @ApiModelProperty(value = "校验类别名称", dataType = "String")
+    private String measureCategoryName;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
index 01759aa..d2c2ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
@@ -31,6 +31,9 @@
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUser;
 
+    @ApiModelProperty(value = "原始记录单id", dataType = "Long")
+    private Long id;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
index 201dc35..792e0fe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
@@ -154,4 +154,8 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "检校类别名称", dataType = "String")
     private String measureCategoryName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "原始记录模板名称", dataType = "String")
+    private String templateName;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index c43341f..d03ab22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -306,6 +306,8 @@
         approvalList.forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
             approval.setApprovalStatus(taskMap.get(String.valueOf(approval.getId())));
+            approval.setMeasureCategoryName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_CATEGORY, approval.getMeasureCategory()));
+
         });
         //排序
         return approvalList.stream().sorted(Comparator.comparing(CertificateReportResponse::getCreateTime).reversed()).collect(Collectors.toList());
@@ -315,6 +317,7 @@
         approvalList.stream().forEach(result -> {
             //审批状态两种获取方式：1、在此处设置，2、在flowable中设置业务状态，暂采取1
             result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, status));
+            result.setMeasureCategoryName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_CATEGORY, result.getMeasureCategory()));
         });
         return approvalList;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
index 046e4aa..1e35b7a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
@@ -17,8 +17,11 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
+import com.casic.missiles.model.system.SystemTemplate;
 import com.casic.missiles.service.business.*;
 import com.casic.missiles.service.customer.CustomerSampleService;
+import com.casic.missiles.service.system.ISystemTemplateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.springframework.stereotype.Service;
@@ -27,7 +30,6 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -54,6 +56,9 @@
     private IBusinessOriginalRecordEquipmentRelationService originalRecordEquipmentRelationService;
     @Resource
     private IBaseExportService iBaseExportService;
+    @Resource
+    private ISystemTemplateService templateService;
+
 
     @Override
     public Page<BusinessOriginalRecord> originListPage(Page<BusinessOriginalRecord> page, OriginRecordRequest request) throws Exception {
@@ -71,6 +76,11 @@
     }
 
     @Override
+    public Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> sampleInfoPage, OriginRecordRequest request) {
+        return customerSampleService.samplesByOderId(sampleInfoPage, request.getId(), request.getSampleNo(), request.getSampleName());
+    }
+
+    @Override
     public BusinessOriginalRecord originalDetail(Long id) throws Exception {
         BusinessOriginalRecord businessOriginalRecord = this.baseMapper.selectById(id);
         if (businessOriginalRecord != null) {
@@ -94,6 +104,14 @@
 
             //字典值转换
             DictCodeUtils.convertDictCodeToName(businessOriginalRecord);
+
+            //显示模板名称
+            if (null != businessOriginalRecord.getTemplateId()) {
+                SystemTemplate systemTemplate = templateService.getById(businessOriginalRecord.getTemplateId());
+                if (systemTemplate != null) {
+                    businessOriginalRecord.setTemplateName(systemTemplate.getTemplateName());
+                }
+            }
         }
         return businessOriginalRecord;
     }
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 3bbcaaf..4889e55 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
@@ -176,6 +176,11 @@
         return certificateResponsePage;
     }
 
+    @Override
+    public Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,Long orderId, String sampleNo, String sampleName) {
+        return this.baseMapper.samplesByOderId(page,orderId,sampleNo,sampleName);
+    }
+
     private BusinessOrderSampleRelation getSampleStatusById(Long sampleId) {
         QueryWrapper<BusinessOrderSampleRelation> wrapper = new QueryWrapper<BusinessOrderSampleRelation>()
                 .eq("sample_id", sampleId)
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java
index 7da0b11..cbb6b40 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -20,6 +21,8 @@
 
     Page<BusinessOriginalRecord> originListPage(Page<BusinessOriginalRecord> page, OriginRecordRequest request) throws Exception;
 
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> sampleInfoPage, OriginRecordRequest request) ;
+
     BusinessOriginalRecord originalDetail(Long id) throws Exception;
 
     ReturnDTO deleteOriginal(Long id);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
index f126f11..db996fc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import io.swagger.annotations.Api;
@@ -98,6 +99,14 @@
         businessOriginalRecordService.originExport(request, response);
     }
 
+
+    @ApiOperation("根据委托单id查询关联样品信息(分页)")
+    @PostMapping("/samplesByOderId")
+    public ReturnDTO<PageInfoBT<CustomerSampleInfo>> samplesByOderId(@RequestBody @Valid OriginRecordRequest request)  {
+        Page<CustomerSampleInfo> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessOriginalRecordService.samplesByOderId(page, request)));
+    }
+
 //    @ApiOperation("获取设备")
 //    @PostMapping("/getEquipments")
 //    public void getEquipments() {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6c5dbb0..a2118ac 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -40,5 +40,7 @@
     String ASSET_TYPE_1 = "1";
 
     String MEASURE_STATUS = "measureStatus";
+    //校验类别
+    String MEASURE_CATEGORY= "measureCategory";
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
index c80edce..443faa0 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
@@ -31,7 +31,6 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
-
     @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from  business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')")
     Long selectMaxCode(String prefix);
 
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 1bb682e..fde0627 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
@@ -1,10 +1,19 @@
 package com.casic.missiles.mapper.customer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CustomerSampleMapper extends BaseMapper<CustomerSampleInfo> {
 
     Long selectMaxSampleNo();
 
+
+
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
+                                             @Param("orderId") Long orderId,
+                                             @Param("sampleNo") String sampleNo,
+                                             @Param("sampleName") String sampleName);
+
 }
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 f49dc26..3657cfd 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -95,17 +95,21 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            csi.measure_category AS measureCategory,
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             AND approval_status = #{request.approvalStatus}
-            AND create_user = #{request.createUserId}
+            AND bcr.create_user = #{request.createUserId}
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
@@ -131,15 +135,18 @@
             csi.sample_name AS sampleName,
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
-            bo.order_code AS orderCode
+            bo.order_code AS orderCode,
+            su.name AS measurePersonName
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
             LEFT JOIN customer_sample_info csi
-            ON csi.sample_id=csi.id
+            ON bcr.sample_id=csi.id
+            LEFT JOIN sys_user su
+            ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
             <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{certificateReportCode},'%')
+                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
             </if>
             <if test="request.orderCode != null and request.orderCode !=''">
                 and bo.order_code like concat('%',#{request.orderCode},'%')
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
index b4d8744..247f3d6 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml
@@ -30,9 +30,9 @@
 
     <select id="originListPage" resultType="com.casic.missiles.model.business.BusinessOriginalRecord">
         SELECT
-        <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
@@ -61,15 +61,15 @@
 
     <select id="originExportList" resultType="com.casic.missiles.dto.business.originRecord.OriginRecordResponse">
         SELECT
-        <include refid="Base_Column_List"/>,
-        cs.sample_no AS sampleNo,
-        cs.sample_name AS sampleName,
-        cs.sample_model AS sampleModel,
-        cs.manufacturing_no AS manufacturingNo,
-        su.name  AS createUserName
+            <include refid="Base_Column_List"/>,
+            cs.sample_no AS sampleNo,
+            cs.sample_name AS sampleName,
+            cs.sample_model AS sampleModel,
+            cs.manufacturing_no AS manufacturingNo,
+            su.name  AS createUserName
         FROM business_original_record bor
-        LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
-        LEFT JOIN sys_user su ON su.id = bor.create_user
+            LEFT JOIN customer_sample_info cs ON bor.sample_id = cs.id
+            LEFT JOIN sys_user su ON su.id = bor.create_user
         WHERE bor.is_del =0
         <if test="request.originalRecordCode != null and request.originalRecordCode !='' ">
             and bor.original_record_code like concat('%', #{request.originalRecordCode}, '%')
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 e67c097..f10fbb3 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,4 +7,23 @@
         FROM customer_sample_info
     </select>
 
+
+    <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
+        SELECT
+            csi.*
+        FROM customer_sample_info csi
+            LEFT JOIN business_order_sample_relation sr ON sr.sample_id = csi.id
+        WHERE csi.is_del =0
+            <if test="sampleNo != null and sampleNo !=''">
+                and csi.sample_no like concat('%', #{sampleNo}, '%')
+            </if>
+            <if test="sampleName != null and sampleName !=''">
+                and csi.sample_name like concat('%', #{sampleName}, '%')
+            </if>
+            <if test="orderId != null and orderId !=''">
+                and sr.order_id  = #{orderId}
+            </if>
+        ORDER BY csi.create_time DESC
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index f9f4490..b43617c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -6,6 +6,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -74,6 +75,8 @@
     @ApiModelProperty(value = "检定人员", dataType = "String")
     private String measurePersonId;
 
+    @ApiModelProperty(value = "检定人员名称", dataType = "String")
+    private String measurePersonName;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     @DictCodeField(message = "审批状态不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@@ -84,6 +87,7 @@
 //
 //    private Long createUser;
 //
+    @ApiModelProperty(value = "创建时间", dataType = "String")
     private String createTime;
 
 
@@ -112,4 +116,11 @@
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
+    @ApiModelProperty(value = "校验类别id", dataType = "String")
+    private String measureCategory;
+
+    @ApiModelProperty(value = "校验类别名称", dataType = "String")
+    private String measureCategoryName;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
index 01759aa..d2c2ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/originRecord/OriginRecordRequest.java
@@ -31,6 +31,9 @@
     @ApiModelProperty(value = "创建人", dataType = "String")
     private String createUser;
 
+    @ApiModelProperty(value = "原始记录单id", dataType = "Long")
+    private Long id;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
index 201dc35..792e0fe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java
@@ -154,4 +154,8 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "检校类别名称", dataType = "String")
     private String measureCategoryName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "原始记录模板名称", dataType = "String")
+    private String templateName;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index c43341f..d03ab22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -306,6 +306,8 @@
         approvalList.forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
             approval.setApprovalStatus(taskMap.get(String.valueOf(approval.getId())));
+            approval.setMeasureCategoryName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_CATEGORY, approval.getMeasureCategory()));
+
         });
         //排序
         return approvalList.stream().sorted(Comparator.comparing(CertificateReportResponse::getCreateTime).reversed()).collect(Collectors.toList());
@@ -315,6 +317,7 @@
         approvalList.stream().forEach(result -> {
             //审批状态两种获取方式：1、在此处设置，2、在flowable中设置业务状态，暂采取1
             result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, status));
+            result.setMeasureCategoryName(dictService.getDictNameByCode(MeterDictEnum.MEASURE_CATEGORY, result.getMeasureCategory()));
         });
         return approvalList;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
index 046e4aa..1e35b7a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
@@ -17,8 +17,11 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOriginalRecordMapper;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
+import com.casic.missiles.model.system.SystemTemplate;
 import com.casic.missiles.service.business.*;
 import com.casic.missiles.service.customer.CustomerSampleService;
+import com.casic.missiles.service.system.ISystemTemplateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.springframework.stereotype.Service;
@@ -27,7 +30,6 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -54,6 +56,9 @@
     private IBusinessOriginalRecordEquipmentRelationService originalRecordEquipmentRelationService;
     @Resource
     private IBaseExportService iBaseExportService;
+    @Resource
+    private ISystemTemplateService templateService;
+
 
     @Override
     public Page<BusinessOriginalRecord> originListPage(Page<BusinessOriginalRecord> page, OriginRecordRequest request) throws Exception {
@@ -71,6 +76,11 @@
     }
 
     @Override
+    public Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> sampleInfoPage, OriginRecordRequest request) {
+        return customerSampleService.samplesByOderId(sampleInfoPage, request.getId(), request.getSampleNo(), request.getSampleName());
+    }
+
+    @Override
     public BusinessOriginalRecord originalDetail(Long id) throws Exception {
         BusinessOriginalRecord businessOriginalRecord = this.baseMapper.selectById(id);
         if (businessOriginalRecord != null) {
@@ -94,6 +104,14 @@
 
             //字典值转换
             DictCodeUtils.convertDictCodeToName(businessOriginalRecord);
+
+            //显示模板名称
+            if (null != businessOriginalRecord.getTemplateId()) {
+                SystemTemplate systemTemplate = templateService.getById(businessOriginalRecord.getTemplateId());
+                if (systemTemplate != null) {
+                    businessOriginalRecord.setTemplateName(systemTemplate.getTemplateName());
+                }
+            }
         }
         return businessOriginalRecord;
     }
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 3bbcaaf..4889e55 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
@@ -176,6 +176,11 @@
         return certificateResponsePage;
     }
 
+    @Override
+    public Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,Long orderId, String sampleNo, String sampleName) {
+        return this.baseMapper.samplesByOderId(page,orderId,sampleNo,sampleName);
+    }
+
     private BusinessOrderSampleRelation getSampleStatusById(Long sampleId) {
         QueryWrapper<BusinessOrderSampleRelation> wrapper = new QueryWrapper<BusinessOrderSampleRelation>()
                 .eq("sample_id", sampleId)
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java
index 7da0b11..cbb6b40 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java
@@ -5,6 +5,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -20,6 +21,8 @@
 
     Page<BusinessOriginalRecord> originListPage(Page<BusinessOriginalRecord> page, OriginRecordRequest request) throws Exception;
 
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> sampleInfoPage, OriginRecordRequest request) ;
+
     BusinessOriginalRecord originalDetail(Long id) throws Exception;
 
     ReturnDTO deleteOriginal(Long id);
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 2c4f179..8b97619 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
@@ -28,4 +28,15 @@
 
     Page<CertificationResponse> certificationBySampleId(Long id);
 
+    /**
+     * 根据 委托书id、样品编号、样品名称查询样品信息（分页）
+     *
+     * @param page
+     * @param orderId
+     * @param sampleNo
+     * @param sampleName
+     * @return
+     */
+    Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page, Long orderId, String sampleNo, String sampleName);
+
 }