diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index e2e6681..59f60ea 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -163,7 +163,7 @@
     @ApiOperation("根据样品id/客户id查询检定证书")
     @PostMapping("/certificateRecordsById")
     public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
+        return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(customerSampleIdRequest)));
     }
 
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index e2e6681..59f60ea 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -163,7 +163,7 @@
     @ApiOperation("根据样品id/客户id查询检定证书")
     @PostMapping("/certificateRecordsById")
     public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
+        return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(customerSampleIdRequest)));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
index 2c0880e..c2af7d9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
@@ -43,4 +43,7 @@
     //校验类别
     String MEASURE_CATEGORY= "measureCategory";
 
+    //证书类型
+    String CERTIFICATION_CLASS= "certificationClass";
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index e2e6681..59f60ea 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -163,7 +163,7 @@
     @ApiOperation("根据样品id/客户id查询检定证书")
     @PostMapping("/certificateRecordsById")
     public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
+        return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(customerSampleIdRequest)));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
index 2c0880e..c2af7d9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
@@ -43,4 +43,7 @@
     //校验类别
     String MEASURE_CATEGORY= "measureCategory";
 
+    //证书类型
+    String CERTIFICATION_CLASS= "certificationClass";
+
 }
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 eadd2c2..0e2fa7e 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
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.business.certificate.CertificateReportResponse;
 import com.casic.missiles.dto.business.print.CertificateListRequest;
 import com.casic.missiles.dto.business.print.CertificateListResponse;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest;
 import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse;
@@ -33,12 +34,13 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
     Page<CertificateMonitorResponse>  certificateMonitorsById(Page<CertificateMonitorResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
     @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);
 
-
+    BusinessCertificateReport detailById( @Param("id") Long id);
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index e2e6681..59f60ea 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -163,7 +163,7 @@
     @ApiOperation("根据样品id/客户id查询检定证书")
     @PostMapping("/certificateRecordsById")
     public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
+        return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(customerSampleIdRequest)));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
index 2c0880e..c2af7d9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
@@ -43,4 +43,7 @@
     //校验类别
     String MEASURE_CATEGORY= "measureCategory";
 
+    //证书类型
+    String CERTIFICATION_CLASS= "certificationClass";
+
 }
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 eadd2c2..0e2fa7e 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
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.business.certificate.CertificateReportResponse;
 import com.casic.missiles.dto.business.print.CertificateListRequest;
 import com.casic.missiles.dto.business.print.CertificateListResponse;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest;
 import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse;
@@ -33,12 +34,13 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
     Page<CertificateMonitorResponse>  certificateMonitorsById(Page<CertificateMonitorResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
     @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);
 
-
+    BusinessCertificateReport detailById( @Param("id") Long id);
 
 }
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 c7779c8..719742d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -29,66 +29,72 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, print_status, print_num, remark, is_del, create_user, create_time, update_time
+        id
+        , certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, print_status, print_num, remark, is_del, create_user, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
-        SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo",
-        csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",
-        csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",
-        bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId"
+        SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS
+        "certificateName",csi.sample_no AS "sampleNo",
+        csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS
+        "manufacturingNo",bo.order_code AS "orderNo",
+        csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS
+        "printStatus",bcr.print_num AS "printNum",
+        bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS
+        "measurePersonId"
         FROM (
-            SELECT *
-            FROM business_certificate_report
-            WHERE is_del = 0
-            <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_report_code like concat('%',#{request.certificateNo},'%')
-            </if>
-            <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_report_category like concat('%',#{request.certificateClass},'%')
-            </if>
-            <if test="request.printStatus != null and request.printStatus !=''">
-                and print_status = #{request.printStatus}
-            </if>
-            <if test="businessKey != null">
-                and bcr.id in
-                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.ids != null">
-                and bcr.id in
-                <foreach collection="request.ids " item="id" index="index" open="(" close=")" separator=",">
-                    #{id}
-                </foreach>
-            </if>
+        SELECT *
+        FROM business_certificate_report
+        WHERE is_del = 0
+        <if test="request.certificateNo != null and request.certificateNo !=''">
+            and certificate_report_code like concat('%',#{request.certificateNo},'%')
+        </if>
+        <if test="request.certificateClass != null and request.certificateClass !=''">
+            and certificate_report_category like concat('%',#{request.certificateClass},'%')
+        </if>
+        <if test="request.printStatus != null and request.printStatus !=''">
+            and print_status = #{request.printStatus}
+        </if>
+        <if test="businessKey != null">
+            and bcr.id in
+            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.ids != null">
+            and bcr.id in
+            <foreach collection="request.ids " item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ) bcr
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del=0
-            <if test="request.orderNo != null and request.orderNo !=''">
-                and ORDER_CODE like concat('%',#{request.orderNo},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and CUSTOMER_NAME like concat('%',#{request.customerName},'%')
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del=0
+        <if test="request.orderNo != null and request.orderNo !=''">
+            and ORDER_CODE like concat('%',#{request.orderNo},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and CUSTOMER_NAME like concat('%',#{request.customerName},'%')
+        </if>
         ) bo ON bo.id=bcr.order_id
         JOIN (
-            SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type
-            FROM customer_sample_info
-            WHERE is_del=0
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
-            </if>
+        SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type
+        FROM customer_sample_info
+        WHERE is_del=0
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
+        </if>
         ) csi ON csi.id=bcr.sample_id
     </select>
 
 
-    <select id="selectDraftListForApproval" resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
+    <select id="selectDraftListForApproval"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
             bcr.*,
             csi.sample_no AS sampleNo,
@@ -128,7 +134,8 @@
             </if>
     </select>
 
-    <select id="selectBatchForApproval" resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
+    <select id="selectBatchForApproval"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
             bcr.*,
             csi.sample_no AS sampleNo,
@@ -136,7 +143,8 @@
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
             bo.order_code AS orderCode,
-            su.name AS measurePersonName
+            su.name AS measurePersonName,
+            csi.measure_category AS measureCategory
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
@@ -171,7 +179,8 @@
     </select>
 
 
-    <select id="certificateMonitorsById" resultType="com.casic.missiles.dto.business.certificate.CertificateMonitorResponse">
+    <select id="certificateMonitorsById"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateMonitorResponse">
         SELECT
         bcr.id AS certificationId,
         bcr.certificate_report_code AS certificateReportCode,
@@ -189,7 +198,34 @@
         <if test="request.sampleId != null and request.sampleId !=''">
             AND bcr.sample_id=#{request.sampleId}
         </if>
-        ORDER BY bcr.update_time  DESC
+        ORDER BY bcr.update_time DESC
+    </select>
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
+        "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
     </select>
 
+
+    <select id="detailById" resultType="com.casic.missiles.model.business.BusinessCertificateReport">
+        SELECT bcr.*,
+               ss.sign_name     AS signName,
+               ss.sign_name     AS approvalSignName,
+               st.template_name AS templateName
+        FROM business_certificate_report bcr
+                 LEFT JOIN system_sign ss ON bcr.sign_id = ss.id
+                 LEFT JOIN system_sign ss1 ON bcr.approval_sign_id = ss1.id
+                 LEFT JOIN system_template st ON bcr.template_id = st.id
+        WHERE bcr.is_del = 0
+          AND bcr.ID = #{id}
+    </select>
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index e2e6681..59f60ea 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -163,7 +163,7 @@
     @ApiOperation("根据样品id/客户id查询检定证书")
     @PostMapping("/certificateRecordsById")
     public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
+        return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(customerSampleIdRequest)));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
index 2c0880e..c2af7d9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
@@ -43,4 +43,7 @@
     //校验类别
     String MEASURE_CATEGORY= "measureCategory";
 
+    //证书类型
+    String CERTIFICATION_CLASS= "certificationClass";
+
 }
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 eadd2c2..0e2fa7e 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
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.business.certificate.CertificateReportResponse;
 import com.casic.missiles.dto.business.print.CertificateListRequest;
 import com.casic.missiles.dto.business.print.CertificateListResponse;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest;
 import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse;
@@ -33,12 +34,13 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
     Page<CertificateMonitorResponse>  certificateMonitorsById(Page<CertificateMonitorResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
     @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);
 
-
+    BusinessCertificateReport detailById( @Param("id") Long id);
 
 }
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 c7779c8..719742d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -29,66 +29,72 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, print_status, print_num, remark, is_del, create_user, create_time, update_time
+        id
+        , certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, print_status, print_num, remark, is_del, create_user, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
-        SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo",
-        csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",
-        csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",
-        bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId"
+        SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS
+        "certificateName",csi.sample_no AS "sampleNo",
+        csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS
+        "manufacturingNo",bo.order_code AS "orderNo",
+        csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS
+        "printStatus",bcr.print_num AS "printNum",
+        bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS
+        "measurePersonId"
         FROM (
-            SELECT *
-            FROM business_certificate_report
-            WHERE is_del = 0
-            <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_report_code like concat('%',#{request.certificateNo},'%')
-            </if>
-            <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_report_category like concat('%',#{request.certificateClass},'%')
-            </if>
-            <if test="request.printStatus != null and request.printStatus !=''">
-                and print_status = #{request.printStatus}
-            </if>
-            <if test="businessKey != null">
-                and bcr.id in
-                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.ids != null">
-                and bcr.id in
-                <foreach collection="request.ids " item="id" index="index" open="(" close=")" separator=",">
-                    #{id}
-                </foreach>
-            </if>
+        SELECT *
+        FROM business_certificate_report
+        WHERE is_del = 0
+        <if test="request.certificateNo != null and request.certificateNo !=''">
+            and certificate_report_code like concat('%',#{request.certificateNo},'%')
+        </if>
+        <if test="request.certificateClass != null and request.certificateClass !=''">
+            and certificate_report_category like concat('%',#{request.certificateClass},'%')
+        </if>
+        <if test="request.printStatus != null and request.printStatus !=''">
+            and print_status = #{request.printStatus}
+        </if>
+        <if test="businessKey != null">
+            and bcr.id in
+            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.ids != null">
+            and bcr.id in
+            <foreach collection="request.ids " item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ) bcr
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del=0
-            <if test="request.orderNo != null and request.orderNo !=''">
-                and ORDER_CODE like concat('%',#{request.orderNo},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and CUSTOMER_NAME like concat('%',#{request.customerName},'%')
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del=0
+        <if test="request.orderNo != null and request.orderNo !=''">
+            and ORDER_CODE like concat('%',#{request.orderNo},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and CUSTOMER_NAME like concat('%',#{request.customerName},'%')
+        </if>
         ) bo ON bo.id=bcr.order_id
         JOIN (
-            SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type
-            FROM customer_sample_info
-            WHERE is_del=0
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
-            </if>
+        SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type
+        FROM customer_sample_info
+        WHERE is_del=0
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
+        </if>
         ) csi ON csi.id=bcr.sample_id
     </select>
 
 
-    <select id="selectDraftListForApproval" resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
+    <select id="selectDraftListForApproval"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
             bcr.*,
             csi.sample_no AS sampleNo,
@@ -128,7 +134,8 @@
             </if>
     </select>
 
-    <select id="selectBatchForApproval" resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
+    <select id="selectBatchForApproval"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
             bcr.*,
             csi.sample_no AS sampleNo,
@@ -136,7 +143,8 @@
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
             bo.order_code AS orderCode,
-            su.name AS measurePersonName
+            su.name AS measurePersonName,
+            csi.measure_category AS measureCategory
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
@@ -171,7 +179,8 @@
     </select>
 
 
-    <select id="certificateMonitorsById" resultType="com.casic.missiles.dto.business.certificate.CertificateMonitorResponse">
+    <select id="certificateMonitorsById"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateMonitorResponse">
         SELECT
         bcr.id AS certificationId,
         bcr.certificate_report_code AS certificateReportCode,
@@ -189,7 +198,34 @@
         <if test="request.sampleId != null and request.sampleId !=''">
             AND bcr.sample_id=#{request.sampleId}
         </if>
-        ORDER BY bcr.update_time  DESC
+        ORDER BY bcr.update_time DESC
+    </select>
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
+        "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
     </select>
 
+
+    <select id="detailById" resultType="com.casic.missiles.model.business.BusinessCertificateReport">
+        SELECT bcr.*,
+               ss.sign_name     AS signName,
+               ss.sign_name     AS approvalSignName,
+               st.template_name AS templateName
+        FROM business_certificate_report bcr
+                 LEFT JOIN system_sign ss ON bcr.sign_id = ss.id
+                 LEFT JOIN system_sign ss1 ON bcr.approval_sign_id = ss1.id
+                 LEFT JOIN system_template st ON bcr.template_id = st.id
+        WHERE bcr.is_del = 0
+          AND bcr.ID = #{id}
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index 25ad1f9..5dd936e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.model.business;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -212,4 +211,21 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "审批状态名称", dataType = "String")
     private String approvalStatusName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "电子签章名称", dataType = "String")
+    private String signName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "认可标志专用章名称", dataType = "String")
+    private String approvalSignName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "模板名称", dataType = "String")
+    private String templateName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index e2e6681..59f60ea 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -163,7 +163,7 @@
     @ApiOperation("根据样品id/客户id查询检定证书")
     @PostMapping("/certificateRecordsById")
     public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
+        return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(customerSampleIdRequest)));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
index 2c0880e..c2af7d9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
@@ -43,4 +43,7 @@
     //校验类别
     String MEASURE_CATEGORY= "measureCategory";
 
+    //证书类型
+    String CERTIFICATION_CLASS= "certificationClass";
+
 }
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 eadd2c2..0e2fa7e 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
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.business.certificate.CertificateReportResponse;
 import com.casic.missiles.dto.business.print.CertificateListRequest;
 import com.casic.missiles.dto.business.print.CertificateListResponse;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest;
 import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse;
@@ -33,12 +34,13 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
     Page<CertificateMonitorResponse>  certificateMonitorsById(Page<CertificateMonitorResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
     @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);
 
-
+    BusinessCertificateReport detailById( @Param("id") Long id);
 
 }
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 c7779c8..719742d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -29,66 +29,72 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, print_status, print_num, remark, is_del, create_user, create_time, update_time
+        id
+        , certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, print_status, print_num, remark, is_del, create_user, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
-        SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo",
-        csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",
-        csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",
-        bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId"
+        SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS
+        "certificateName",csi.sample_no AS "sampleNo",
+        csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS
+        "manufacturingNo",bo.order_code AS "orderNo",
+        csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS
+        "printStatus",bcr.print_num AS "printNum",
+        bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS
+        "measurePersonId"
         FROM (
-            SELECT *
-            FROM business_certificate_report
-            WHERE is_del = 0
-            <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_report_code like concat('%',#{request.certificateNo},'%')
-            </if>
-            <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_report_category like concat('%',#{request.certificateClass},'%')
-            </if>
-            <if test="request.printStatus != null and request.printStatus !=''">
-                and print_status = #{request.printStatus}
-            </if>
-            <if test="businessKey != null">
-                and bcr.id in
-                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.ids != null">
-                and bcr.id in
-                <foreach collection="request.ids " item="id" index="index" open="(" close=")" separator=",">
-                    #{id}
-                </foreach>
-            </if>
+        SELECT *
+        FROM business_certificate_report
+        WHERE is_del = 0
+        <if test="request.certificateNo != null and request.certificateNo !=''">
+            and certificate_report_code like concat('%',#{request.certificateNo},'%')
+        </if>
+        <if test="request.certificateClass != null and request.certificateClass !=''">
+            and certificate_report_category like concat('%',#{request.certificateClass},'%')
+        </if>
+        <if test="request.printStatus != null and request.printStatus !=''">
+            and print_status = #{request.printStatus}
+        </if>
+        <if test="businessKey != null">
+            and bcr.id in
+            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.ids != null">
+            and bcr.id in
+            <foreach collection="request.ids " item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ) bcr
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del=0
-            <if test="request.orderNo != null and request.orderNo !=''">
-                and ORDER_CODE like concat('%',#{request.orderNo},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and CUSTOMER_NAME like concat('%',#{request.customerName},'%')
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del=0
+        <if test="request.orderNo != null and request.orderNo !=''">
+            and ORDER_CODE like concat('%',#{request.orderNo},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and CUSTOMER_NAME like concat('%',#{request.customerName},'%')
+        </if>
         ) bo ON bo.id=bcr.order_id
         JOIN (
-            SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type
-            FROM customer_sample_info
-            WHERE is_del=0
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
-            </if>
+        SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type
+        FROM customer_sample_info
+        WHERE is_del=0
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
+        </if>
         ) csi ON csi.id=bcr.sample_id
     </select>
 
 
-    <select id="selectDraftListForApproval" resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
+    <select id="selectDraftListForApproval"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
             bcr.*,
             csi.sample_no AS sampleNo,
@@ -128,7 +134,8 @@
             </if>
     </select>
 
-    <select id="selectBatchForApproval" resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
+    <select id="selectBatchForApproval"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
             bcr.*,
             csi.sample_no AS sampleNo,
@@ -136,7 +143,8 @@
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
             bo.order_code AS orderCode,
-            su.name AS measurePersonName
+            su.name AS measurePersonName,
+            csi.measure_category AS measureCategory
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
@@ -171,7 +179,8 @@
     </select>
 
 
-    <select id="certificateMonitorsById" resultType="com.casic.missiles.dto.business.certificate.CertificateMonitorResponse">
+    <select id="certificateMonitorsById"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateMonitorResponse">
         SELECT
         bcr.id AS certificationId,
         bcr.certificate_report_code AS certificateReportCode,
@@ -189,7 +198,34 @@
         <if test="request.sampleId != null and request.sampleId !=''">
             AND bcr.sample_id=#{request.sampleId}
         </if>
-        ORDER BY bcr.update_time  DESC
+        ORDER BY bcr.update_time DESC
+    </select>
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
+        "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
     </select>
 
+
+    <select id="detailById" resultType="com.casic.missiles.model.business.BusinessCertificateReport">
+        SELECT bcr.*,
+               ss.sign_name     AS signName,
+               ss.sign_name     AS approvalSignName,
+               st.template_name AS templateName
+        FROM business_certificate_report bcr
+                 LEFT JOIN system_sign ss ON bcr.sign_id = ss.id
+                 LEFT JOIN system_sign ss1 ON bcr.approval_sign_id = ss1.id
+                 LEFT JOIN system_template st ON bcr.template_id = st.id
+        WHERE bcr.is_del = 0
+          AND bcr.ID = #{id}
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index 25ad1f9..5dd936e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.model.business;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -212,4 +211,21 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "审批状态名称", dataType = "String")
     private String approvalStatusName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "电子签章名称", dataType = "String")
+    private String signName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "认可标志专用章名称", dataType = "String")
+    private String approvalSignName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "模板名称", dataType = "String")
+    private String templateName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
 }
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 7e34c6c..5e59e2e 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
@@ -15,6 +15,7 @@
 import com.casic.missiles.dto.business.certificate.CertificateMonitorResponse;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportResponse;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.flowable.AllApproveDTO;
 import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
@@ -93,7 +94,7 @@
 
         initCertificateReport(certificateReport);
         if (this.baseMapper.insert(certificateReport) > 0)
-            return ReturnUtil.success();
+            return ReturnUtil.success(certificateReport.getId());
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
@@ -143,10 +144,12 @@
      */
     @Override
     public BusinessCertificateReport certificateReportDetail(Long id) {
-        BusinessCertificateReport certificateReport = this.baseMapper.selectById(id);
+//        BusinessCertificateReport certificateReport = this.baseMapper.selectById(id);
+        BusinessCertificateReport certificateReport = this.baseMapper.detailById(id);
         if (certificateReport.getOriginalRecordId() != null) {
             try {
                 certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId()));
+                certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS,certificateReport.getCertificateReportType()));
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -271,6 +274,23 @@
         return row > 0 ? true : false;
     }
 
+
+
+    /**
+     * 客户、样品详情列表
+     */
+    @Override
+    public Page<CertificationResponse> certificateRecordsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception {
+        Page<CertificationResponse> page = PageFactory.defaultPage();
+        Page<CertificationResponse> certificateResponsePage = this.baseMapper.certificateRecordsById(page, customerSampleIdRequest);
+        for (CertificationResponse customerSampleListResponse : certificateResponsePage.getRecords()) {
+            if (!StringUtils.isEmpty(customerSampleListResponse.getCertificationClass())) {
+                DictCodeUtils.convertDictMultiCodeToName(customerSampleListResponse);
+            }
+        }
+        return certificateResponsePage;
+    }
+
     @Override
     public Page<CertificateMonitorResponse> certificateMonitorsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception {
         Page<CertificateMonitorResponse> page = PageFactory.defaultPage();
@@ -295,7 +315,7 @@
                 }
             });
         }
-        return null;
+        return certificateMonitorResponsePage;
     }
 
     private List<CertificateReportResponse> handleApprovalStatus(Page<CertificateReportResponse> page, CertificateReportApprovalRequest request) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
index e2e6681..59f60ea 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
@@ -163,7 +163,7 @@
     @ApiOperation("根据样品id/客户id查询检定证书")
     @PostMapping("/certificateRecordsById")
     public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
+        return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(customerSampleIdRequest)));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
index 2c0880e..c2af7d9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java
@@ -43,4 +43,7 @@
     //校验类别
     String MEASURE_CATEGORY= "measureCategory";
 
+    //证书类型
+    String CERTIFICATION_CLASS= "certificationClass";
+
 }
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 eadd2c2..0e2fa7e 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
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.business.certificate.CertificateReportResponse;
 import com.casic.missiles.dto.business.print.CertificateListRequest;
 import com.casic.missiles.dto.business.print.CertificateListResponse;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.meter.TraceSupplierApprovalListRequest;
 import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse;
@@ -33,12 +34,13 @@
 
     List<CertificateReportResponse> selectBatchForApproval(@Param("page")Page<CertificateReportResponse> page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List<String> businessKey);
 
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
     Page<CertificateMonitorResponse>  certificateMonitorsById(Page<CertificateMonitorResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
     @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);
 
-
+    BusinessCertificateReport detailById( @Param("id") Long id);
 
 }
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 c7779c8..719742d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -29,66 +29,72 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, print_status, print_num, remark, is_del, create_user, create_time, update_time
+        id
+        , certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, print_status, print_num, remark, is_del, create_user, create_time, update_time
     </sql>
 
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
-        SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo",
-        csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS "manufacturingNo",bo.order_code AS "orderNo",
-        csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",
-        bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS "measurePersonId"
+        SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS
+        "certificateName",csi.sample_no AS "sampleNo",
+        csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS
+        "manufacturingNo",bo.order_code AS "orderNo",
+        csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS
+        "printStatus",bcr.print_num AS "printNum",
+        bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS
+        "measurePersonId"
         FROM (
-            SELECT *
-            FROM business_certificate_report
-            WHERE is_del = 0
-            <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_report_code like concat('%',#{request.certificateNo},'%')
-            </if>
-            <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_report_category like concat('%',#{request.certificateClass},'%')
-            </if>
-            <if test="request.printStatus != null and request.printStatus !=''">
-                and print_status = #{request.printStatus}
-            </if>
-            <if test="businessKey != null">
-                and bcr.id in
-                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.ids != null">
-                and bcr.id in
-                <foreach collection="request.ids " item="id" index="index" open="(" close=")" separator=",">
-                    #{id}
-                </foreach>
-            </if>
+        SELECT *
+        FROM business_certificate_report
+        WHERE is_del = 0
+        <if test="request.certificateNo != null and request.certificateNo !=''">
+            and certificate_report_code like concat('%',#{request.certificateNo},'%')
+        </if>
+        <if test="request.certificateClass != null and request.certificateClass !=''">
+            and certificate_report_category like concat('%',#{request.certificateClass},'%')
+        </if>
+        <if test="request.printStatus != null and request.printStatus !=''">
+            and print_status = #{request.printStatus}
+        </if>
+        <if test="businessKey != null">
+            and bcr.id in
+            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.ids != null">
+            and bcr.id in
+            <foreach collection="request.ids " item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         ) bcr
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del=0
-            <if test="request.orderNo != null and request.orderNo !=''">
-                and ORDER_CODE like concat('%',#{request.orderNo},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and CUSTOMER_NAME like concat('%',#{request.customerName},'%')
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del=0
+        <if test="request.orderNo != null and request.orderNo !=''">
+            and ORDER_CODE like concat('%',#{request.orderNo},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and CUSTOMER_NAME like concat('%',#{request.customerName},'%')
+        </if>
         ) bo ON bo.id=bcr.order_id
         JOIN (
-            SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type
-            FROM customer_sample_info
-            WHERE is_del=0
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
-            </if>
+        SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type
+        FROM customer_sample_info
+        WHERE is_del=0
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
+        </if>
         ) csi ON csi.id=bcr.sample_id
     </select>
 
 
-    <select id="selectDraftListForApproval" resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
+    <select id="selectDraftListForApproval"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
             bcr.*,
             csi.sample_no AS sampleNo,
@@ -128,7 +134,8 @@
             </if>
     </select>
 
-    <select id="selectBatchForApproval" resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
+    <select id="selectBatchForApproval"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
             bcr.*,
             csi.sample_no AS sampleNo,
@@ -136,7 +143,8 @@
             csi.sample_model AS sampleModel,
             csi.manufacturing_no AS manufacturingNo,
             bo.order_code AS orderCode,
-            su.name AS measurePersonName
+            su.name AS measurePersonName,
+            csi.measure_category AS measureCategory
         FROM business_certificate_report bcr
             LEFT JOIN business_order bo
             ON bcr.order_id=bo.id
@@ -171,7 +179,8 @@
     </select>
 
 
-    <select id="certificateMonitorsById" resultType="com.casic.missiles.dto.business.certificate.CertificateMonitorResponse">
+    <select id="certificateMonitorsById"
+            resultType="com.casic.missiles.dto.business.certificate.CertificateMonitorResponse">
         SELECT
         bcr.id AS certificationId,
         bcr.certificate_report_code AS certificateReportCode,
@@ -189,7 +198,34 @@
         <if test="request.sampleId != null and request.sampleId !=''">
             AND bcr.sample_id=#{request.sampleId}
         </if>
-        ORDER BY bcr.update_time  DESC
+        ORDER BY bcr.update_time DESC
+    </select>
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
+        "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
     </select>
 
+
+    <select id="detailById" resultType="com.casic.missiles.model.business.BusinessCertificateReport">
+        SELECT bcr.*,
+               ss.sign_name     AS signName,
+               ss.sign_name     AS approvalSignName,
+               st.template_name AS templateName
+        FROM business_certificate_report bcr
+                 LEFT JOIN system_sign ss ON bcr.sign_id = ss.id
+                 LEFT JOIN system_sign ss1 ON bcr.approval_sign_id = ss1.id
+                 LEFT JOIN system_template st ON bcr.template_id = st.id
+        WHERE bcr.is_del = 0
+          AND bcr.ID = #{id}
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index 25ad1f9..5dd936e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.model.business;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -212,4 +211,21 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "审批状态名称", dataType = "String")
     private String approvalStatusName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "电子签章名称", dataType = "String")
+    private String signName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "认可标志专用章名称", dataType = "String")
+    private String approvalSignName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "模板名称", dataType = "String")
+    private String templateName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
 }
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 7e34c6c..5e59e2e 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
@@ -15,6 +15,7 @@
 import com.casic.missiles.dto.business.certificate.CertificateMonitorResponse;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportResponse;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.flowable.AllApproveDTO;
 import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
@@ -93,7 +94,7 @@
 
         initCertificateReport(certificateReport);
         if (this.baseMapper.insert(certificateReport) > 0)
-            return ReturnUtil.success();
+            return ReturnUtil.success(certificateReport.getId());
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
@@ -143,10 +144,12 @@
      */
     @Override
     public BusinessCertificateReport certificateReportDetail(Long id) {
-        BusinessCertificateReport certificateReport = this.baseMapper.selectById(id);
+//        BusinessCertificateReport certificateReport = this.baseMapper.selectById(id);
+        BusinessCertificateReport certificateReport = this.baseMapper.detailById(id);
         if (certificateReport.getOriginalRecordId() != null) {
             try {
                 certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId()));
+                certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS,certificateReport.getCertificateReportType()));
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -271,6 +274,23 @@
         return row > 0 ? true : false;
     }
 
+
+
+    /**
+     * 客户、样品详情列表
+     */
+    @Override
+    public Page<CertificationResponse> certificateRecordsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception {
+        Page<CertificationResponse> page = PageFactory.defaultPage();
+        Page<CertificationResponse> certificateResponsePage = this.baseMapper.certificateRecordsById(page, customerSampleIdRequest);
+        for (CertificationResponse customerSampleListResponse : certificateResponsePage.getRecords()) {
+            if (!StringUtils.isEmpty(customerSampleListResponse.getCertificationClass())) {
+                DictCodeUtils.convertDictMultiCodeToName(customerSampleListResponse);
+            }
+        }
+        return certificateResponsePage;
+    }
+
     @Override
     public Page<CertificateMonitorResponse> certificateMonitorsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception {
         Page<CertificateMonitorResponse> page = PageFactory.defaultPage();
@@ -295,7 +315,7 @@
                 }
             });
         }
-        return null;
+        return certificateMonitorResponsePage;
     }
 
     private List<CertificateReportResponse> handleApprovalStatus(Page<CertificateReportResponse> page, CertificateReportApprovalRequest request) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java
index ad27c2a..81cb155 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.business.certificate.CertificateMonitorResponse;
 import com.casic.missiles.dto.business.certificate.CertificateReportApprovalRequest;
 import com.casic.missiles.dto.business.certificate.CertificateReportResponse;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
 import com.casic.missiles.model.business.BusinessCertificateReport;
@@ -43,7 +44,8 @@
     void originExport(CertificateReportApprovalRequest request, HttpServletResponse response);
 
     boolean updateCertificateReportState(Long id);
+
     Page<CertificateMonitorResponse> certificateMonitorsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception;
 
-
+    Page<CertificationResponse> certificateRecordsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception;
 }