diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
index b4b8390..63f9095 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
@@ -30,7 +30,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bcp.id, certificate_report_code, certificate_report_name, original_record_id, original_record_name, certificate_report_category, certificate_report_type,measure_content,measure_type, sample_id, sample_name, order_id, customer_no, customer_name, customer_phone, customer_email, customer_address, deliverer_id, deliverer, deliverer_tel, plan_deliver_time, require_over_time, approval_status, print_num, print_status, measure_dept_id, measure_person_id,certificate_report_file, remark, create_user, create_time, is_del
-        ,sign_id,template_id,process_id
+        ,sign_id,template_id,process_id,manufacturing_no,sample_model,original_record_code,sample_no
     </sql>
 
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
@@ -109,7 +109,7 @@
            WHERE is_del=0
         )bo ON bo.id =order_id
         LEFT JOIN(
-            SELECT id,sample_no,sample_name,measure_content,measure_type
+            SELECT id,sample_no,sample_name,measure_content,measure_type,manufacturing_no,sample_model
             FROM customer_sample_info
             WHERE is_del=0
         )csi ON csi.id =sample_id
@@ -119,7 +119,7 @@
             WHERE is_del=0
         )ci ON ci.id =bo.customer_id
         LEFT JOIN (
-            SELECT id,original_Record_Name
+            SELECT id,original_Record_Name,original_record_code
             FROM  business_original_record
             WHERE  is_del=0
         )boc ON boc.id=bcp.original_record_id

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
index b4b8390..63f9095 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
@@ -30,7 +30,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bcp.id, certificate_report_code, certificate_report_name, original_record_id, original_record_name, certificate_report_category, certificate_report_type,measure_content,measure_type, sample_id, sample_name, order_id, customer_no, customer_name, customer_phone, customer_email, customer_address, deliverer_id, deliverer, deliverer_tel, plan_deliver_time, require_over_time, approval_status, print_num, print_status, measure_dept_id, measure_person_id,certificate_report_file, remark, create_user, create_time, is_del
-        ,sign_id,template_id,process_id
+        ,sign_id,template_id,process_id,manufacturing_no,sample_model,original_record_code,sample_no
     </sql>
 
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
@@ -109,7 +109,7 @@
            WHERE is_del=0
         )bo ON bo.id =order_id
         LEFT JOIN(
-            SELECT id,sample_no,sample_name,measure_content,measure_type
+            SELECT id,sample_no,sample_name,measure_content,measure_type,manufacturing_no,sample_model
             FROM customer_sample_info
             WHERE is_del=0
         )csi ON csi.id =sample_id
@@ -119,7 +119,7 @@
             WHERE is_del=0
         )ci ON ci.id =bo.customer_id
         LEFT JOIN (
-            SELECT id,original_Record_Name
+            SELECT id,original_Record_Name,original_record_code
             FROM  business_original_record
             WHERE  is_del=0
         )boc ON boc.id=bcp.original_record_id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java
index 8f758e6..5c897da 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java
@@ -29,6 +29,10 @@
     @TableField("original_record_id")
     private Long originalRecordId;
 
+    @ApiModelProperty("原始记录编号")
+    @TableField("original_record_code")
+    private String originalRecordCode;
+
     @ApiModelProperty("原始记录名称")
     @TableField("original_record_name")
     private String originalRecordName;
@@ -70,6 +74,16 @@
     @TableField(exist = false)
     private String sampleName;
 
+
+    @ApiModelProperty("出厂编号")
+    @TableField(exist = false)
+    private String manufacturingNo;
+
+    @ApiModelProperty("型号")
+    @TableField(exist = false)
+    private String sampleModel;
+
+
     /**
      * 流程实例id
      */

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
index b4b8390..63f9095 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
@@ -30,7 +30,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bcp.id, certificate_report_code, certificate_report_name, original_record_id, original_record_name, certificate_report_category, certificate_report_type,measure_content,measure_type, sample_id, sample_name, order_id, customer_no, customer_name, customer_phone, customer_email, customer_address, deliverer_id, deliverer, deliverer_tel, plan_deliver_time, require_over_time, approval_status, print_num, print_status, measure_dept_id, measure_person_id,certificate_report_file, remark, create_user, create_time, is_del
-        ,sign_id,template_id,process_id
+        ,sign_id,template_id,process_id,manufacturing_no,sample_model,original_record_code,sample_no
     </sql>
 
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
@@ -109,7 +109,7 @@
            WHERE is_del=0
         )bo ON bo.id =order_id
         LEFT JOIN(
-            SELECT id,sample_no,sample_name,measure_content,measure_type
+            SELECT id,sample_no,sample_name,measure_content,measure_type,manufacturing_no,sample_model
             FROM customer_sample_info
             WHERE is_del=0
         )csi ON csi.id =sample_id
@@ -119,7 +119,7 @@
             WHERE is_del=0
         )ci ON ci.id =bo.customer_id
         LEFT JOIN (
-            SELECT id,original_Record_Name
+            SELECT id,original_Record_Name,original_record_code
             FROM  business_original_record
             WHERE  is_del=0
         )boc ON boc.id=bcp.original_record_id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java
index 8f758e6..5c897da 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java
@@ -29,6 +29,10 @@
     @TableField("original_record_id")
     private Long originalRecordId;
 
+    @ApiModelProperty("原始记录编号")
+    @TableField("original_record_code")
+    private String originalRecordCode;
+
     @ApiModelProperty("原始记录名称")
     @TableField("original_record_name")
     private String originalRecordName;
@@ -70,6 +74,16 @@
     @TableField(exist = false)
     private String sampleName;
 
+
+    @ApiModelProperty("出厂编号")
+    @TableField(exist = false)
+    private String manufacturingNo;
+
+    @ApiModelProperty("型号")
+    @TableField(exist = false)
+    private String sampleModel;
+
+
     /**
      * 流程实例id
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 312f4ef..37a81ed 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -178,7 +178,16 @@
             if ("0".equals(request.getApprovalStatus())) {
                 request.setApprovalStatus("");
             }
-            approvalList = this.baseMapper.selectBatchForApprovalList(page, request, null);
+            List<String> businessKeys = null;
+            switch (request.getApprovalStatus()){
+                case ApprovalStatusEnum.IN_APPROVED:
+                    businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
+                    break;
+                case ApprovalStatusEnum.PASSED:
+                    businessKeys = baseApprovalService.getPassedList(request.getFormId());
+                    break;
+            }
+            approvalList = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
         }
         List<Map<String, String>> staffList = this.baseMapper.getMeterStaffList();
         Map<Long, String> staffMap = staffList.stream().collect(