diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 435f9c8..4094bf1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -78,7 +78,7 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody  @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 435f9c8..4094bf1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -78,7 +78,7 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody  @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
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 fc9330e..499ba5c 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
@@ -19,7 +19,7 @@
  */
 public interface BusinessCertificateReportMapper extends BaseMapper<BusinessCertificateReport> {
 
-    List<BusinessCertificateReport> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
+    List<CertificateListResponse> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
 
 
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 435f9c8..4094bf1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -78,7 +78,7 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody  @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
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 fc9330e..499ba5c 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
@@ -19,7 +19,7 @@
  */
 public interface BusinessCertificateReportMapper extends BaseMapper<BusinessCertificateReport> {
 
-    List<BusinessCertificateReport> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
+    List<CertificateListResponse> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
 
 
 
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 13456e6..1086ec8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -32,8 +32,11 @@
         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.model.business.BusinessCertificateReport">
-        SELECT *
+    <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
+        SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_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",bo.measure_type
+        AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS  "approvalStatus"
+        bcr.create_time AS "createTime",measurePersonId
         FROM (
             SELECT *
             FROM business_certificate_report
@@ -42,12 +45,17 @@
                 and certificate_no like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and CERTIFICATE_CLASS like concat('%',#{request.certificateClass},'%')
+                and certificate_class like concat('%',#{request.certificateClass},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+            <if test="request.printStatus != null and request.printStatus !=''">
+                and print_status like concat('%',#{request.printStatus},'%')
+            </if>
+            <if test="request.businessKey != null">
+                and bcr.id in
+                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bcr
         JOIN (
             SELECT id
@@ -62,7 +70,7 @@
         ) bo ON bo.id=bcr.orderId
         JOIN (
             SELECT id
-            FROM business_order
+            FROM customer_sample_info
             WHERE is_del=0
             <if test="request.sampleNo != null and request.sampleNo !=''">
                 and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
@@ -70,7 +78,7 @@
             <if test="request.sampleName != null and request.sampleName !=''">
                 and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
             </if>
-        ) bo ON bo.id=bcr.sampleId
+        ) csi ON csi.id=bcr.sampleId
     </select>
 
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 435f9c8..4094bf1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -78,7 +78,7 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody  @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
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 fc9330e..499ba5c 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
@@ -19,7 +19,7 @@
  */
 public interface BusinessCertificateReportMapper extends BaseMapper<BusinessCertificateReport> {
 
-    List<BusinessCertificateReport> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
+    List<CertificateListResponse> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
 
 
 
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 13456e6..1086ec8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -32,8 +32,11 @@
         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.model.business.BusinessCertificateReport">
-        SELECT *
+    <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
+        SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_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",bo.measure_type
+        AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS  "approvalStatus"
+        bcr.create_time AS "createTime",measurePersonId
         FROM (
             SELECT *
             FROM business_certificate_report
@@ -42,12 +45,17 @@
                 and certificate_no like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and CERTIFICATE_CLASS like concat('%',#{request.certificateClass},'%')
+                and certificate_class like concat('%',#{request.certificateClass},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+            <if test="request.printStatus != null and request.printStatus !=''">
+                and print_status like concat('%',#{request.printStatus},'%')
+            </if>
+            <if test="request.businessKey != null">
+                and bcr.id in
+                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bcr
         JOIN (
             SELECT id
@@ -62,7 +70,7 @@
         ) bo ON bo.id=bcr.orderId
         JOIN (
             SELECT id
-            FROM business_order
+            FROM customer_sample_info
             WHERE is_del=0
             <if test="request.sampleNo != null and request.sampleNo !=''">
                 and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
@@ -70,7 +78,7 @@
             <if test="request.sampleName != null and request.sampleName !=''">
                 and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
             </if>
-        ) bo ON bo.id=bcr.sampleId
+        ) csi ON csi.id=bcr.sampleId
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2730c9c..83802df 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -36,23 +36,23 @@
     </sql>
 
     <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
+        SELECT   bif.id,deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
-        FROM business_interchange
-        WHERE is_del = 0
-            <if test="request.interchangeCode != null and request.interchangeCode !=''">
-                AND interchange_Code=#{request.interchangeCode}
-            </if>
-            <if test="request.reciever != null and request.reciever !=''">
-                AND reciever=#{request.reciever}
-            </if>
-            <if test="request.deliverTime != null and request.deliverTime !=''">
-                AND deliver_time=#{request.deliverTime}
-            </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+            FROM business_interchange
+            WHERE is_del = 0
+                <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                    AND interchange_Code=#{request.interchangeCode}
+                </if>
+                <if test="request.reciever != null and request.reciever !=''">
+                    AND reciever=#{request.reciever}
+                </if>
+                <if test="request.deliverTime != null and request.deliverTime !=''">
+                    AND deliver_time=#{request.deliverTime}
+                </if>
         ) bif
         JOIN (
-            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime"
             FROM business_order
             WHERE is_del = 0
             <if test="request.deliverer != null and request.deliverer !=''">
@@ -65,7 +65,7 @@
                 AND customer_name=#{request.customerName}
             </if>
         ) bo ON bo.orderId = bif.order_id
-        ORDER BY bo.deliverTime DESC
+        ORDER BY bif.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 435f9c8..4094bf1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -78,7 +78,7 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody  @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
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 fc9330e..499ba5c 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
@@ -19,7 +19,7 @@
  */
 public interface BusinessCertificateReportMapper extends BaseMapper<BusinessCertificateReport> {
 
-    List<BusinessCertificateReport> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
+    List<CertificateListResponse> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
 
 
 
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 13456e6..1086ec8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -32,8 +32,11 @@
         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.model.business.BusinessCertificateReport">
-        SELECT *
+    <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
+        SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_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",bo.measure_type
+        AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS  "approvalStatus"
+        bcr.create_time AS "createTime",measurePersonId
         FROM (
             SELECT *
             FROM business_certificate_report
@@ -42,12 +45,17 @@
                 and certificate_no like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and CERTIFICATE_CLASS like concat('%',#{request.certificateClass},'%')
+                and certificate_class like concat('%',#{request.certificateClass},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+            <if test="request.printStatus != null and request.printStatus !=''">
+                and print_status like concat('%',#{request.printStatus},'%')
+            </if>
+            <if test="request.businessKey != null">
+                and bcr.id in
+                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bcr
         JOIN (
             SELECT id
@@ -62,7 +70,7 @@
         ) bo ON bo.id=bcr.orderId
         JOIN (
             SELECT id
-            FROM business_order
+            FROM customer_sample_info
             WHERE is_del=0
             <if test="request.sampleNo != null and request.sampleNo !=''">
                 and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
@@ -70,7 +78,7 @@
             <if test="request.sampleName != null and request.sampleName !=''">
                 and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
             </if>
-        ) bo ON bo.id=bcr.sampleId
+        ) csi ON csi.id=bcr.sampleId
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2730c9c..83802df 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -36,23 +36,23 @@
     </sql>
 
     <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
+        SELECT   bif.id,deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
-        FROM business_interchange
-        WHERE is_del = 0
-            <if test="request.interchangeCode != null and request.interchangeCode !=''">
-                AND interchange_Code=#{request.interchangeCode}
-            </if>
-            <if test="request.reciever != null and request.reciever !=''">
-                AND reciever=#{request.reciever}
-            </if>
-            <if test="request.deliverTime != null and request.deliverTime !=''">
-                AND deliver_time=#{request.deliverTime}
-            </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+            FROM business_interchange
+            WHERE is_del = 0
+                <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                    AND interchange_Code=#{request.interchangeCode}
+                </if>
+                <if test="request.reciever != null and request.reciever !=''">
+                    AND reciever=#{request.reciever}
+                </if>
+                <if test="request.deliverTime != null and request.deliverTime !=''">
+                    AND deliver_time=#{request.deliverTime}
+                </if>
         ) bif
         JOIN (
-            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime"
             FROM business_order
             WHERE is_del = 0
             <if test="request.deliverer != null and request.deliverer !=''">
@@ -65,7 +65,7 @@
                 AND customer_name=#{request.customerName}
             </if>
         ) bo ON bo.orderId = bif.order_id
-        ORDER BY bo.deliverTime DESC
+        ORDER BY bif.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index c313a73..92402b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -54,6 +54,7 @@
              AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
+        limit 1
     </select>
 
     <select id="selectExecutiveList" resultType="com.casic.missiles.dto.business.MeasureProcessDTO">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 435f9c8..4094bf1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -78,7 +78,7 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody  @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
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 fc9330e..499ba5c 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
@@ -19,7 +19,7 @@
  */
 public interface BusinessCertificateReportMapper extends BaseMapper<BusinessCertificateReport> {
 
-    List<BusinessCertificateReport> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
+    List<CertificateListResponse> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
 
 
 
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 13456e6..1086ec8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -32,8 +32,11 @@
         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.model.business.BusinessCertificateReport">
-        SELECT *
+    <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
+        SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_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",bo.measure_type
+        AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS  "approvalStatus"
+        bcr.create_time AS "createTime",measurePersonId
         FROM (
             SELECT *
             FROM business_certificate_report
@@ -42,12 +45,17 @@
                 and certificate_no like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and CERTIFICATE_CLASS like concat('%',#{request.certificateClass},'%')
+                and certificate_class like concat('%',#{request.certificateClass},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+            <if test="request.printStatus != null and request.printStatus !=''">
+                and print_status like concat('%',#{request.printStatus},'%')
+            </if>
+            <if test="request.businessKey != null">
+                and bcr.id in
+                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bcr
         JOIN (
             SELECT id
@@ -62,7 +70,7 @@
         ) bo ON bo.id=bcr.orderId
         JOIN (
             SELECT id
-            FROM business_order
+            FROM customer_sample_info
             WHERE is_del=0
             <if test="request.sampleNo != null and request.sampleNo !=''">
                 and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
@@ -70,7 +78,7 @@
             <if test="request.sampleName != null and request.sampleName !=''">
                 and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
             </if>
-        ) bo ON bo.id=bcr.sampleId
+        ) csi ON csi.id=bcr.sampleId
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2730c9c..83802df 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -36,23 +36,23 @@
     </sql>
 
     <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
+        SELECT   bif.id,deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
-        FROM business_interchange
-        WHERE is_del = 0
-            <if test="request.interchangeCode != null and request.interchangeCode !=''">
-                AND interchange_Code=#{request.interchangeCode}
-            </if>
-            <if test="request.reciever != null and request.reciever !=''">
-                AND reciever=#{request.reciever}
-            </if>
-            <if test="request.deliverTime != null and request.deliverTime !=''">
-                AND deliver_time=#{request.deliverTime}
-            </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+            FROM business_interchange
+            WHERE is_del = 0
+                <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                    AND interchange_Code=#{request.interchangeCode}
+                </if>
+                <if test="request.reciever != null and request.reciever !=''">
+                    AND reciever=#{request.reciever}
+                </if>
+                <if test="request.deliverTime != null and request.deliverTime !=''">
+                    AND deliver_time=#{request.deliverTime}
+                </if>
         ) bif
         JOIN (
-            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime"
             FROM business_order
             WHERE is_del = 0
             <if test="request.deliverer != null and request.deliverer !=''">
@@ -65,7 +65,7 @@
                 AND customer_name=#{request.customerName}
             </if>
         ) bo ON bo.orderId = bif.order_id
-        ORDER BY bo.deliverTime DESC
+        ORDER BY bif.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index c313a73..92402b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -54,6 +54,7 @@
              AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
+        limit 1
     </select>
 
     <select id="selectExecutiveList" resultType="com.casic.missiles.dto.business.MeasureProcessDTO">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 90e80a1..04ed845 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,6 +25,8 @@
 
     private static final long serialVersionUID = 1L;
 
+    private Long id;
+
     private Long orderId;
     private Long sampleId;
     private String sampleStatus;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 435f9c8..4094bf1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -78,7 +78,7 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody  @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
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 fc9330e..499ba5c 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
@@ -19,7 +19,7 @@
  */
 public interface BusinessCertificateReportMapper extends BaseMapper<BusinessCertificateReport> {
 
-    List<BusinessCertificateReport> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
+    List<CertificateListResponse> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
 
 
 
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 13456e6..1086ec8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -32,8 +32,11 @@
         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.model.business.BusinessCertificateReport">
-        SELECT *
+    <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
+        SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_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",bo.measure_type
+        AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS  "approvalStatus"
+        bcr.create_time AS "createTime",measurePersonId
         FROM (
             SELECT *
             FROM business_certificate_report
@@ -42,12 +45,17 @@
                 and certificate_no like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and CERTIFICATE_CLASS like concat('%',#{request.certificateClass},'%')
+                and certificate_class like concat('%',#{request.certificateClass},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+            <if test="request.printStatus != null and request.printStatus !=''">
+                and print_status like concat('%',#{request.printStatus},'%')
+            </if>
+            <if test="request.businessKey != null">
+                and bcr.id in
+                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bcr
         JOIN (
             SELECT id
@@ -62,7 +70,7 @@
         ) bo ON bo.id=bcr.orderId
         JOIN (
             SELECT id
-            FROM business_order
+            FROM customer_sample_info
             WHERE is_del=0
             <if test="request.sampleNo != null and request.sampleNo !=''">
                 and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
@@ -70,7 +78,7 @@
             <if test="request.sampleName != null and request.sampleName !=''">
                 and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
             </if>
-        ) bo ON bo.id=bcr.sampleId
+        ) csi ON csi.id=bcr.sampleId
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2730c9c..83802df 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -36,23 +36,23 @@
     </sql>
 
     <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
+        SELECT   bif.id,deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
-        FROM business_interchange
-        WHERE is_del = 0
-            <if test="request.interchangeCode != null and request.interchangeCode !=''">
-                AND interchange_Code=#{request.interchangeCode}
-            </if>
-            <if test="request.reciever != null and request.reciever !=''">
-                AND reciever=#{request.reciever}
-            </if>
-            <if test="request.deliverTime != null and request.deliverTime !=''">
-                AND deliver_time=#{request.deliverTime}
-            </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+            FROM business_interchange
+            WHERE is_del = 0
+                <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                    AND interchange_Code=#{request.interchangeCode}
+                </if>
+                <if test="request.reciever != null and request.reciever !=''">
+                    AND reciever=#{request.reciever}
+                </if>
+                <if test="request.deliverTime != null and request.deliverTime !=''">
+                    AND deliver_time=#{request.deliverTime}
+                </if>
         ) bif
         JOIN (
-            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime"
             FROM business_order
             WHERE is_del = 0
             <if test="request.deliverer != null and request.deliverer !=''">
@@ -65,7 +65,7 @@
                 AND customer_name=#{request.customerName}
             </if>
         ) bo ON bo.orderId = bif.order_id
-        ORDER BY bo.deliverTime DESC
+        ORDER BY bif.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index c313a73..92402b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -54,6 +54,7 @@
              AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
+        limit 1
     </select>
 
     <select id="selectExecutiveList" resultType="com.casic.missiles.dto.business.MeasureProcessDTO">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 90e80a1..04ed845 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,6 +25,8 @@
 
     private static final long serialVersionUID = 1L;
 
+    private Long id;
+
     private Long orderId;
     private Long sampleId;
     private String sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index dced92e..a50acea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -48,7 +48,19 @@
     @ExcelProperty(value = "交接时间",order = 5)
     private String deliverTime;
 
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    @ExcelProperty(value = "委托书编号",order = 6)
+    private String orderNo;
+
+    @ApiModelProperty(value = "要求捡完时间", dataType = "String")
+    @ExcelProperty(value = "要求捡完时间",order = 7)
+    private String requireOverTime; //委托书中自带
+
+    @ApiModelProperty(value = "是否加急", dataType = "String")
+    @ExcelProperty(value = "是否加急",order = 8)
+    private String isUrgent;
+
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 6)
+    @ExcelProperty(value = "备注",order = 9)
     private String remark;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 435f9c8..4094bf1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -78,7 +78,7 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody  @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
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 fc9330e..499ba5c 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
@@ -19,7 +19,7 @@
  */
 public interface BusinessCertificateReportMapper extends BaseMapper<BusinessCertificateReport> {
 
-    List<BusinessCertificateReport> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
+    List<CertificateListResponse> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
 
 
 
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 13456e6..1086ec8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -32,8 +32,11 @@
         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.model.business.BusinessCertificateReport">
-        SELECT *
+    <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
+        SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_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",bo.measure_type
+        AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS  "approvalStatus"
+        bcr.create_time AS "createTime",measurePersonId
         FROM (
             SELECT *
             FROM business_certificate_report
@@ -42,12 +45,17 @@
                 and certificate_no like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and CERTIFICATE_CLASS like concat('%',#{request.certificateClass},'%')
+                and certificate_class like concat('%',#{request.certificateClass},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+            <if test="request.printStatus != null and request.printStatus !=''">
+                and print_status like concat('%',#{request.printStatus},'%')
+            </if>
+            <if test="request.businessKey != null">
+                and bcr.id in
+                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bcr
         JOIN (
             SELECT id
@@ -62,7 +70,7 @@
         ) bo ON bo.id=bcr.orderId
         JOIN (
             SELECT id
-            FROM business_order
+            FROM customer_sample_info
             WHERE is_del=0
             <if test="request.sampleNo != null and request.sampleNo !=''">
                 and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
@@ -70,7 +78,7 @@
             <if test="request.sampleName != null and request.sampleName !=''">
                 and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
             </if>
-        ) bo ON bo.id=bcr.sampleId
+        ) csi ON csi.id=bcr.sampleId
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2730c9c..83802df 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -36,23 +36,23 @@
     </sql>
 
     <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
+        SELECT   bif.id,deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
-        FROM business_interchange
-        WHERE is_del = 0
-            <if test="request.interchangeCode != null and request.interchangeCode !=''">
-                AND interchange_Code=#{request.interchangeCode}
-            </if>
-            <if test="request.reciever != null and request.reciever !=''">
-                AND reciever=#{request.reciever}
-            </if>
-            <if test="request.deliverTime != null and request.deliverTime !=''">
-                AND deliver_time=#{request.deliverTime}
-            </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+            FROM business_interchange
+            WHERE is_del = 0
+                <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                    AND interchange_Code=#{request.interchangeCode}
+                </if>
+                <if test="request.reciever != null and request.reciever !=''">
+                    AND reciever=#{request.reciever}
+                </if>
+                <if test="request.deliverTime != null and request.deliverTime !=''">
+                    AND deliver_time=#{request.deliverTime}
+                </if>
         ) bif
         JOIN (
-            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime"
             FROM business_order
             WHERE is_del = 0
             <if test="request.deliverer != null and request.deliverer !=''">
@@ -65,7 +65,7 @@
                 AND customer_name=#{request.customerName}
             </if>
         ) bo ON bo.orderId = bif.order_id
-        ORDER BY bo.deliverTime DESC
+        ORDER BY bif.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index c313a73..92402b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -54,6 +54,7 @@
              AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
+        limit 1
     </select>
 
     <select id="selectExecutiveList" resultType="com.casic.missiles.dto.business.MeasureProcessDTO">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 90e80a1..04ed845 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,6 +25,8 @@
 
     private static final long serialVersionUID = 1L;
 
+    private Long id;
+
     private Long orderId;
     private Long sampleId;
     private String sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index dced92e..a50acea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -48,7 +48,19 @@
     @ExcelProperty(value = "交接时间",order = 5)
     private String deliverTime;
 
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    @ExcelProperty(value = "委托书编号",order = 6)
+    private String orderNo;
+
+    @ApiModelProperty(value = "要求捡完时间", dataType = "String")
+    @ExcelProperty(value = "要求捡完时间",order = 7)
+    private String requireOverTime; //委托书中自带
+
+    @ApiModelProperty(value = "是否加急", dataType = "String")
+    @ExcelProperty(value = "是否加急",order = 8)
+    private String isUrgent;
+
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 6)
+    @ExcelProperty(value = "备注",order = 9)
     private String remark;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
index 7f3be53..db7a231 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
@@ -10,7 +10,7 @@
 @ApiModel("设备接收")
 public class CertificateListRequest {
 
-    @ApiModelProperty(value = "表单id(前端自定义)", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
     private String formId;
 
     @ApiModelProperty(value = "证书编号", dataType = "String")
@@ -31,8 +31,8 @@
     @ApiModelProperty(value = "证书类型(非类别)", dataType = "String")
     private String certificateClass;
 
-    @ApiModelProperty(value = "未打印(传0，否则不传)", dataType = "String")
-    private String printSatus;
+    @ApiModelProperty(value = "可打印(传0)", dataType = "String")
+    private Integer printStatus;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     private String approvalStatus;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 435f9c8..4094bf1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -78,7 +78,7 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody  @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
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 fc9330e..499ba5c 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
@@ -19,7 +19,7 @@
  */
 public interface BusinessCertificateReportMapper extends BaseMapper<BusinessCertificateReport> {
 
-    List<BusinessCertificateReport> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
+    List<CertificateListResponse> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
 
 
 
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 13456e6..1086ec8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -32,8 +32,11 @@
         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.model.business.BusinessCertificateReport">
-        SELECT *
+    <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
+        SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_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",bo.measure_type
+        AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS  "approvalStatus"
+        bcr.create_time AS "createTime",measurePersonId
         FROM (
             SELECT *
             FROM business_certificate_report
@@ -42,12 +45,17 @@
                 and certificate_no like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and CERTIFICATE_CLASS like concat('%',#{request.certificateClass},'%')
+                and certificate_class like concat('%',#{request.certificateClass},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+            <if test="request.printStatus != null and request.printStatus !=''">
+                and print_status like concat('%',#{request.printStatus},'%')
+            </if>
+            <if test="request.businessKey != null">
+                and bcr.id in
+                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bcr
         JOIN (
             SELECT id
@@ -62,7 +70,7 @@
         ) bo ON bo.id=bcr.orderId
         JOIN (
             SELECT id
-            FROM business_order
+            FROM customer_sample_info
             WHERE is_del=0
             <if test="request.sampleNo != null and request.sampleNo !=''">
                 and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
@@ -70,7 +78,7 @@
             <if test="request.sampleName != null and request.sampleName !=''">
                 and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
             </if>
-        ) bo ON bo.id=bcr.sampleId
+        ) csi ON csi.id=bcr.sampleId
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2730c9c..83802df 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -36,23 +36,23 @@
     </sql>
 
     <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
+        SELECT   bif.id,deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
-        FROM business_interchange
-        WHERE is_del = 0
-            <if test="request.interchangeCode != null and request.interchangeCode !=''">
-                AND interchange_Code=#{request.interchangeCode}
-            </if>
-            <if test="request.reciever != null and request.reciever !=''">
-                AND reciever=#{request.reciever}
-            </if>
-            <if test="request.deliverTime != null and request.deliverTime !=''">
-                AND deliver_time=#{request.deliverTime}
-            </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+            FROM business_interchange
+            WHERE is_del = 0
+                <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                    AND interchange_Code=#{request.interchangeCode}
+                </if>
+                <if test="request.reciever != null and request.reciever !=''">
+                    AND reciever=#{request.reciever}
+                </if>
+                <if test="request.deliverTime != null and request.deliverTime !=''">
+                    AND deliver_time=#{request.deliverTime}
+                </if>
         ) bif
         JOIN (
-            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime"
             FROM business_order
             WHERE is_del = 0
             <if test="request.deliverer != null and request.deliverer !=''">
@@ -65,7 +65,7 @@
                 AND customer_name=#{request.customerName}
             </if>
         ) bo ON bo.orderId = bif.order_id
-        ORDER BY bo.deliverTime DESC
+        ORDER BY bif.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index c313a73..92402b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -54,6 +54,7 @@
              AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
+        limit 1
     </select>
 
     <select id="selectExecutiveList" resultType="com.casic.missiles.dto.business.MeasureProcessDTO">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 90e80a1..04ed845 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,6 +25,8 @@
 
     private static final long serialVersionUID = 1L;
 
+    private Long id;
+
     private Long orderId;
     private Long sampleId;
     private String sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index dced92e..a50acea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -48,7 +48,19 @@
     @ExcelProperty(value = "交接时间",order = 5)
     private String deliverTime;
 
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    @ExcelProperty(value = "委托书编号",order = 6)
+    private String orderNo;
+
+    @ApiModelProperty(value = "要求捡完时间", dataType = "String")
+    @ExcelProperty(value = "要求捡完时间",order = 7)
+    private String requireOverTime; //委托书中自带
+
+    @ApiModelProperty(value = "是否加急", dataType = "String")
+    @ExcelProperty(value = "是否加急",order = 8)
+    private String isUrgent;
+
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 6)
+    @ExcelProperty(value = "备注",order = 9)
     private String remark;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
index 7f3be53..db7a231 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
@@ -10,7 +10,7 @@
 @ApiModel("设备接收")
 public class CertificateListRequest {
 
-    @ApiModelProperty(value = "表单id(前端自定义)", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
     private String formId;
 
     @ApiModelProperty(value = "证书编号", dataType = "String")
@@ -31,8 +31,8 @@
     @ApiModelProperty(value = "证书类型(非类别)", dataType = "String")
     private String certificateClass;
 
-    @ApiModelProperty(value = "未打印(传0，否则不传)", dataType = "String")
-    private String printSatus;
+    @ApiModelProperty(value = "可打印(传0)", dataType = "String")
+    private Integer printStatus;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     private String approvalStatus;
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 79ed0bf..14998ed 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
@@ -11,17 +11,14 @@
 import com.casic.missiles.dto.business.print.CertificateListResponse;
 import com.casic.missiles.dto.flowable.AllApproveDTO;
 import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
-import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.business.IBusinessCertificatePrintService;
-import com.casic.missiles.utils.ConvertUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -46,10 +43,16 @@
         return handleApprovalStatus(page, request);
     }
 
+    //可打印：只需要查询可打印状态即可
+    //查询工作流
     private Page<CertificateListResponse> handleApprovalStatus(Page<CertificateListResponse> page, CertificateListRequest request) {
         Page<CertificateListResponse> approvalList = PageFactory.defaultPage();
         List<String> businessKeys = new ArrayList<>();
         List<BusinessCertificateReport> list;
+        //先进行可打印的操作，如果是可打印操作，则直接返回所有的值
+        if (request.getPrintStatus().equals("0")) {
+            return getPrintableList(page, request);
+        }
         switch (request.getApprovalStatus()) {
             //待审批，该状态维护在flowable中
             case ApprovalStatusEnum.TO_BE_APPROVED:
@@ -58,8 +61,8 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.TO_BE_APPROVED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList,ApprovalStatusEnum.TO_BE_APPROVED);
                     //DTO根据业务主键补全taskId
                     approvalList.getRecords().forEach(approval -> {
                         toBeApprovedList.forEach(toBeApprovedDTO -> {
@@ -76,16 +79,16 @@
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.IN_APPROVED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList, ApprovalStatusEnum.IN_APPROVED);
                 }
 //                break;
-            //已通过，该状态维护在flowable
+                //已通过，该状态维护在flowable
             case ApprovalStatusEnum.PASSED:
                 businessKeys = baseApprovalService.getPassedList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.PASSED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList,ApprovalStatusEnum.PASSED);
                 }
                 break;
             //未通过（包括拒绝、驳回，拒绝为直接删除实例，驳回为驳回到起点），该状态维护在flowable
@@ -93,13 +96,13 @@
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.FAILED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
                 }
                 Page<CertificateListResponse> rejectApprovalList = PageFactory.defaultPage();
                 if (!CollectionUtils.isEmpty(rejectBusinessKey)) {
-                    List<BusinessCertificateReport> rejectList = this.baseMapper.selectBatchForApprovalList(page, request, rejectBusinessKey);
-                    rejectApprovalList = handleApprovalListResponse(approvalList, rejectList, ApprovalStatusEnum.FAILED_REJECT);
+                    rejectApprovalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, rejectBusinessKey));
+                    handleApprovalListResponse(rejectApprovalList, ApprovalStatusEnum.FAILED_REJECT);
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.getRecords().addAll(rejectApprovalList.getRecords());
@@ -113,18 +116,22 @@
                     businessKeys = AllApproveList.stream().map(AllApproveDTO::getBusinessKey).collect(Collectors.toList());
                 }
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleAllApprovalListResponse(approvalList, list, AllApproveList);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    approvalList = handleAllApprovalListResponse(approvalList, AllApproveList);
                 }
                 break;
         }
         return approvalList;
     }
 
-    private Page<CertificateListResponse> handleAllApprovalListResponse(Page<CertificateListResponse> approvalList, List<BusinessCertificateReport> list, List<AllApproveDTO> allApproveList) {
+    private Page<CertificateListResponse> getPrintableList(Page<CertificateListResponse> page, CertificateListRequest request) {
+        page.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, null));
+        return page;
+    }
 
-        Map<String, String> taskMap = allApproveList.stream().collect(Collectors.toMap(AllApproveDTO::getBusinessKey,AllApproveDTO::getStatus));
-        approvalList.setRecords(ConvertUtils.sourceToTarget(list, CertificateListResponse.class));
+
+    private Page<CertificateListResponse> handleAllApprovalListResponse(Page<CertificateListResponse> approvalList, List<AllApproveDTO> allApproveList) {
+        Map<String, String> taskMap = allApproveList.stream().collect(Collectors.toMap(AllApproveDTO::getBusinessKey, AllApproveDTO::getStatus));
         //状态补全
         approvalList.getRecords().forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
@@ -135,13 +142,11 @@
         return approvalList;
     }
 
-    private Page<CertificateListResponse> handleApprovalListResponse(Page<CertificateListResponse> approvalList, List<BusinessCertificateReport> list, String status) {
-        approvalList.setRecords(ConvertUtils.sourceToTarget(list, CertificateListResponse.class));
+    private void handleApprovalListResponse(Page<CertificateListResponse> approvalList, String status) {
         approvalList.getRecords().stream().forEach(result -> {
             //审批状态两种获取方式：1、在此处设置，2、在flowable中设置业务状态，暂采取1
             result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, status));
         });
-        return approvalList;
     }
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 435f9c8..4094bf1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -78,7 +78,7 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody  @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
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 fc9330e..499ba5c 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
@@ -19,7 +19,7 @@
  */
 public interface BusinessCertificateReportMapper extends BaseMapper<BusinessCertificateReport> {
 
-    List<BusinessCertificateReport> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
+    List<CertificateListResponse> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
 
 
 
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 13456e6..1086ec8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -32,8 +32,11 @@
         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.model.business.BusinessCertificateReport">
-        SELECT *
+    <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
+        SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_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",bo.measure_type
+        AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS  "approvalStatus"
+        bcr.create_time AS "createTime",measurePersonId
         FROM (
             SELECT *
             FROM business_certificate_report
@@ -42,12 +45,17 @@
                 and certificate_no like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and CERTIFICATE_CLASS like concat('%',#{request.certificateClass},'%')
+                and certificate_class like concat('%',#{request.certificateClass},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+            <if test="request.printStatus != null and request.printStatus !=''">
+                and print_status like concat('%',#{request.printStatus},'%')
+            </if>
+            <if test="request.businessKey != null">
+                and bcr.id in
+                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bcr
         JOIN (
             SELECT id
@@ -62,7 +70,7 @@
         ) bo ON bo.id=bcr.orderId
         JOIN (
             SELECT id
-            FROM business_order
+            FROM customer_sample_info
             WHERE is_del=0
             <if test="request.sampleNo != null and request.sampleNo !=''">
                 and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
@@ -70,7 +78,7 @@
             <if test="request.sampleName != null and request.sampleName !=''">
                 and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
             </if>
-        ) bo ON bo.id=bcr.sampleId
+        ) csi ON csi.id=bcr.sampleId
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2730c9c..83802df 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -36,23 +36,23 @@
     </sql>
 
     <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
+        SELECT   bif.id,deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
-        FROM business_interchange
-        WHERE is_del = 0
-            <if test="request.interchangeCode != null and request.interchangeCode !=''">
-                AND interchange_Code=#{request.interchangeCode}
-            </if>
-            <if test="request.reciever != null and request.reciever !=''">
-                AND reciever=#{request.reciever}
-            </if>
-            <if test="request.deliverTime != null and request.deliverTime !=''">
-                AND deliver_time=#{request.deliverTime}
-            </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+            FROM business_interchange
+            WHERE is_del = 0
+                <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                    AND interchange_Code=#{request.interchangeCode}
+                </if>
+                <if test="request.reciever != null and request.reciever !=''">
+                    AND reciever=#{request.reciever}
+                </if>
+                <if test="request.deliverTime != null and request.deliverTime !=''">
+                    AND deliver_time=#{request.deliverTime}
+                </if>
         ) bif
         JOIN (
-            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime"
             FROM business_order
             WHERE is_del = 0
             <if test="request.deliverer != null and request.deliverer !=''">
@@ -65,7 +65,7 @@
                 AND customer_name=#{request.customerName}
             </if>
         ) bo ON bo.orderId = bif.order_id
-        ORDER BY bo.deliverTime DESC
+        ORDER BY bif.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index c313a73..92402b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -54,6 +54,7 @@
              AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
+        limit 1
     </select>
 
     <select id="selectExecutiveList" resultType="com.casic.missiles.dto.business.MeasureProcessDTO">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 90e80a1..04ed845 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,6 +25,8 @@
 
     private static final long serialVersionUID = 1L;
 
+    private Long id;
+
     private Long orderId;
     private Long sampleId;
     private String sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index dced92e..a50acea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -48,7 +48,19 @@
     @ExcelProperty(value = "交接时间",order = 5)
     private String deliverTime;
 
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    @ExcelProperty(value = "委托书编号",order = 6)
+    private String orderNo;
+
+    @ApiModelProperty(value = "要求捡完时间", dataType = "String")
+    @ExcelProperty(value = "要求捡完时间",order = 7)
+    private String requireOverTime; //委托书中自带
+
+    @ApiModelProperty(value = "是否加急", dataType = "String")
+    @ExcelProperty(value = "是否加急",order = 8)
+    private String isUrgent;
+
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 6)
+    @ExcelProperty(value = "备注",order = 9)
     private String remark;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
index 7f3be53..db7a231 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
@@ -10,7 +10,7 @@
 @ApiModel("设备接收")
 public class CertificateListRequest {
 
-    @ApiModelProperty(value = "表单id(前端自定义)", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
     private String formId;
 
     @ApiModelProperty(value = "证书编号", dataType = "String")
@@ -31,8 +31,8 @@
     @ApiModelProperty(value = "证书类型(非类别)", dataType = "String")
     private String certificateClass;
 
-    @ApiModelProperty(value = "未打印(传0，否则不传)", dataType = "String")
-    private String printSatus;
+    @ApiModelProperty(value = "可打印(传0)", dataType = "String")
+    private Integer printStatus;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     private String approvalStatus;
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 79ed0bf..14998ed 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
@@ -11,17 +11,14 @@
 import com.casic.missiles.dto.business.print.CertificateListResponse;
 import com.casic.missiles.dto.flowable.AllApproveDTO;
 import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
-import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.business.IBusinessCertificatePrintService;
-import com.casic.missiles.utils.ConvertUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -46,10 +43,16 @@
         return handleApprovalStatus(page, request);
     }
 
+    //可打印：只需要查询可打印状态即可
+    //查询工作流
     private Page<CertificateListResponse> handleApprovalStatus(Page<CertificateListResponse> page, CertificateListRequest request) {
         Page<CertificateListResponse> approvalList = PageFactory.defaultPage();
         List<String> businessKeys = new ArrayList<>();
         List<BusinessCertificateReport> list;
+        //先进行可打印的操作，如果是可打印操作，则直接返回所有的值
+        if (request.getPrintStatus().equals("0")) {
+            return getPrintableList(page, request);
+        }
         switch (request.getApprovalStatus()) {
             //待审批，该状态维护在flowable中
             case ApprovalStatusEnum.TO_BE_APPROVED:
@@ -58,8 +61,8 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.TO_BE_APPROVED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList,ApprovalStatusEnum.TO_BE_APPROVED);
                     //DTO根据业务主键补全taskId
                     approvalList.getRecords().forEach(approval -> {
                         toBeApprovedList.forEach(toBeApprovedDTO -> {
@@ -76,16 +79,16 @@
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.IN_APPROVED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList, ApprovalStatusEnum.IN_APPROVED);
                 }
 //                break;
-            //已通过，该状态维护在flowable
+                //已通过，该状态维护在flowable
             case ApprovalStatusEnum.PASSED:
                 businessKeys = baseApprovalService.getPassedList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.PASSED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList,ApprovalStatusEnum.PASSED);
                 }
                 break;
             //未通过（包括拒绝、驳回，拒绝为直接删除实例，驳回为驳回到起点），该状态维护在flowable
@@ -93,13 +96,13 @@
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.FAILED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
                 }
                 Page<CertificateListResponse> rejectApprovalList = PageFactory.defaultPage();
                 if (!CollectionUtils.isEmpty(rejectBusinessKey)) {
-                    List<BusinessCertificateReport> rejectList = this.baseMapper.selectBatchForApprovalList(page, request, rejectBusinessKey);
-                    rejectApprovalList = handleApprovalListResponse(approvalList, rejectList, ApprovalStatusEnum.FAILED_REJECT);
+                    rejectApprovalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, rejectBusinessKey));
+                    handleApprovalListResponse(rejectApprovalList, ApprovalStatusEnum.FAILED_REJECT);
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.getRecords().addAll(rejectApprovalList.getRecords());
@@ -113,18 +116,22 @@
                     businessKeys = AllApproveList.stream().map(AllApproveDTO::getBusinessKey).collect(Collectors.toList());
                 }
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleAllApprovalListResponse(approvalList, list, AllApproveList);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    approvalList = handleAllApprovalListResponse(approvalList, AllApproveList);
                 }
                 break;
         }
         return approvalList;
     }
 
-    private Page<CertificateListResponse> handleAllApprovalListResponse(Page<CertificateListResponse> approvalList, List<BusinessCertificateReport> list, List<AllApproveDTO> allApproveList) {
+    private Page<CertificateListResponse> getPrintableList(Page<CertificateListResponse> page, CertificateListRequest request) {
+        page.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, null));
+        return page;
+    }
 
-        Map<String, String> taskMap = allApproveList.stream().collect(Collectors.toMap(AllApproveDTO::getBusinessKey,AllApproveDTO::getStatus));
-        approvalList.setRecords(ConvertUtils.sourceToTarget(list, CertificateListResponse.class));
+
+    private Page<CertificateListResponse> handleAllApprovalListResponse(Page<CertificateListResponse> approvalList, List<AllApproveDTO> allApproveList) {
+        Map<String, String> taskMap = allApproveList.stream().collect(Collectors.toMap(AllApproveDTO::getBusinessKey, AllApproveDTO::getStatus));
         //状态补全
         approvalList.getRecords().forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
@@ -135,13 +142,11 @@
         return approvalList;
     }
 
-    private Page<CertificateListResponse> handleApprovalListResponse(Page<CertificateListResponse> approvalList, List<BusinessCertificateReport> list, String status) {
-        approvalList.setRecords(ConvertUtils.sourceToTarget(list, CertificateListResponse.class));
+    private void handleApprovalListResponse(Page<CertificateListResponse> approvalList, String status) {
         approvalList.getRecords().stream().forEach(result -> {
             //审批状态两种获取方式：1、在此处设置，2、在flowable中设置业务状态，暂采取1
             result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, status));
         });
-        return approvalList;
     }
 
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index ef32d16..ed9ef9b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -70,7 +70,7 @@
             customerSampleList.add(customerSampleInfo);
         }
         businessExchange.setCustomerSampleInfoList(customerSampleList);
-        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        return businessExchange;
     }
 
     @Override
@@ -87,7 +87,13 @@
     @Override
     public ReturnDTO updateExchange(BusinessInterchange businessInterchange) {
         Integer updateFlag = this.baseMapper.updateById(businessInterchange);
-        if (updateFlag > 0) {
+        Boolean samplUpdateFlag = true;
+        if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleInfoList())) {
+            for (CustomerSampleInfo sampleInfo : businessInterchange.getCustomerSampleInfoList()) {
+                samplUpdateFlag = samplUpdateFlag && sampleStatusUpdator(sampleInfo, businessInterchange.getOrderId()) > 0;
+            }
+        }
+        if (updateFlag > 0 && samplUpdateFlag) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -96,10 +102,13 @@
     @Override
     public ReturnDTO addExchange(BusinessInterchange businessInterchange) {
         populationExchange(businessInterchange);
+
         Integer addFlag = this.baseMapper.insert(businessInterchange);
         Boolean sampleAddFlag = true;
-        for (CustomerSampleInfo sampleInfo : businessInterchange.getCustomerSampleInfoList()) {
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(businessInterchange.getOrderId(), sampleInfo.getId(), "2") > 0;
+        if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleInfoList())) {
+            for (CustomerSampleInfo sampleInfo : businessInterchange.getCustomerSampleInfoList()) {
+                sampleAddFlag = sampleAddFlag && sampleStatusCreator(businessInterchange.getOrderId(), sampleInfo.getId(), "2") > 0;
+            }
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -112,7 +121,7 @@
         try {
             List<InterchangeListResponse> resultPage;
             if (!CollectionUtils.isEmpty(request.getIds())) {
-                resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
+                resultPage = businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
             } else {
                 Page<InterchangeListResponse> page = PageFactory.defaultPage();
                 page.setCurrent(1);
@@ -126,7 +135,7 @@
         }
     }
 
-    private void  populationExchange(BusinessInterchange businessInterchange){
+    private void populationExchange(BusinessInterchange businessInterchange) {
         Long maxNo = this.baseMapper.selectMaxExchangeNo();
         String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo);
         AuthUser authUser = ShiroKit.getUser();
@@ -144,9 +153,20 @@
         return sampleStatus;
     }
 
+    private Integer sampleStatusUpdator(CustomerSampleInfo customerSampleInfo,Long orderId) {
+        QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("order_id",orderId);
+        queryWrapper.eq(ObjectUtil.isEmpty(customerSampleInfo.getId()), "id", customerSampleInfo.getId());
+        BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
+//        sampleStatusPopulation.setSampleStatus(status);
+//        sampleStatusPopulation.setSampleStatus(status);
+        Integer sampleStatus = this.sampleRelationMapper.update(sampleStatusPopulation, queryWrapper);
+        return sampleStatus;
+    }
+
     private Integer sampleStatusDeletor(Long orderId, String status) {
         QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ObjectUtil.isEmpty(orderId), "order_id", orderId);
+        queryWrapper.eq(ObjectUtil.isNotEmpty(orderId), "order_id", orderId);
         queryWrapper.eq("status", "2");
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setSampleStatus(status);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 435f9c8..4094bf1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -78,7 +78,7 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody  @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
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 fc9330e..499ba5c 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
@@ -19,7 +19,7 @@
  */
 public interface BusinessCertificateReportMapper extends BaseMapper<BusinessCertificateReport> {
 
-    List<BusinessCertificateReport> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
+    List<CertificateListResponse> selectBatchForApprovalList(Page<CertificateListResponse> page, @Param("request") CertificateListRequest request, @Param("businessKey") List<String> businessKey);
 
 
 
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 13456e6..1086ec8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -32,8 +32,11 @@
         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.model.business.BusinessCertificateReport">
-        SELECT *
+    <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.print.CertificateListResponse">
+        SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_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",bo.measure_type
+        AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS  "approvalStatus"
+        bcr.create_time AS "createTime",measurePersonId
         FROM (
             SELECT *
             FROM business_certificate_report
@@ -42,12 +45,17 @@
                 and certificate_no like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and CERTIFICATE_CLASS like concat('%',#{request.certificateClass},'%')
+                and certificate_class like concat('%',#{request.certificateClass},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+            <if test="request.printStatus != null and request.printStatus !=''">
+                and print_status like concat('%',#{request.printStatus},'%')
+            </if>
+            <if test="request.businessKey != null">
+                and bcr.id in
+                <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bcr
         JOIN (
             SELECT id
@@ -62,7 +70,7 @@
         ) bo ON bo.id=bcr.orderId
         JOIN (
             SELECT id
-            FROM business_order
+            FROM customer_sample_info
             WHERE is_del=0
             <if test="request.sampleNo != null and request.sampleNo !=''">
                 and SAMPLE_NO like concat('%',#{request.sampleNo},'%')
@@ -70,7 +78,7 @@
             <if test="request.sampleName != null and request.sampleName !=''">
                 and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
             </if>
-        ) bo ON bo.id=bcr.sampleId
+        ) csi ON csi.id=bcr.sampleId
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2730c9c..83802df 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -36,23 +36,23 @@
     </sql>
 
     <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
+        SELECT   bif.id,deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
-        FROM business_interchange
-        WHERE is_del = 0
-            <if test="request.interchangeCode != null and request.interchangeCode !=''">
-                AND interchange_Code=#{request.interchangeCode}
-            </if>
-            <if test="request.reciever != null and request.reciever !=''">
-                AND reciever=#{request.reciever}
-            </if>
-            <if test="request.deliverTime != null and request.deliverTime !=''">
-                AND deliver_time=#{request.deliverTime}
-            </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+            FROM business_interchange
+            WHERE is_del = 0
+                <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                    AND interchange_Code=#{request.interchangeCode}
+                </if>
+                <if test="request.reciever != null and request.reciever !=''">
+                    AND reciever=#{request.reciever}
+                </if>
+                <if test="request.deliverTime != null and request.deliverTime !=''">
+                    AND deliver_time=#{request.deliverTime}
+                </if>
         ) bif
         JOIN (
-            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime"
             FROM business_order
             WHERE is_del = 0
             <if test="request.deliverer != null and request.deliverer !=''">
@@ -65,7 +65,7 @@
                 AND customer_name=#{request.customerName}
             </if>
         ) bo ON bo.orderId = bif.order_id
-        ORDER BY bo.deliverTime DESC
+        ORDER BY bif.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index c313a73..92402b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -54,6 +54,7 @@
              AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
+        limit 1
     </select>
 
     <select id="selectExecutiveList" resultType="com.casic.missiles.dto.business.MeasureProcessDTO">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 90e80a1..04ed845 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,6 +25,8 @@
 
     private static final long serialVersionUID = 1L;
 
+    private Long id;
+
     private Long orderId;
     private Long sampleId;
     private String sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index dced92e..a50acea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -48,7 +48,19 @@
     @ExcelProperty(value = "交接时间",order = 5)
     private String deliverTime;
 
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    @ExcelProperty(value = "委托书编号",order = 6)
+    private String orderNo;
+
+    @ApiModelProperty(value = "要求捡完时间", dataType = "String")
+    @ExcelProperty(value = "要求捡完时间",order = 7)
+    private String requireOverTime; //委托书中自带
+
+    @ApiModelProperty(value = "是否加急", dataType = "String")
+    @ExcelProperty(value = "是否加急",order = 8)
+    private String isUrgent;
+
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 6)
+    @ExcelProperty(value = "备注",order = 9)
     private String remark;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
index 7f3be53..db7a231 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListRequest.java
@@ -10,7 +10,7 @@
 @ApiModel("设备接收")
 public class CertificateListRequest {
 
-    @ApiModelProperty(value = "表单id(前端自定义)", dataType = "String")
+    @ApiModelProperty(value = "表单id（流程定义对应的表单id，等价于业务id）", dataType = "String")
     private String formId;
 
     @ApiModelProperty(value = "证书编号", dataType = "String")
@@ -31,8 +31,8 @@
     @ApiModelProperty(value = "证书类型(非类别)", dataType = "String")
     private String certificateClass;
 
-    @ApiModelProperty(value = "未打印(传0，否则不传)", dataType = "String")
-    private String printSatus;
+    @ApiModelProperty(value = "可打印(传0)", dataType = "String")
+    private Integer printStatus;
 
     @ApiModelProperty(value = "审批状态", dataType = "String")
     private String approvalStatus;
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 79ed0bf..14998ed 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
@@ -11,17 +11,14 @@
 import com.casic.missiles.dto.business.print.CertificateListResponse;
 import com.casic.missiles.dto.flowable.AllApproveDTO;
 import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
-import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.business.IBusinessCertificatePrintService;
-import com.casic.missiles.utils.ConvertUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -46,10 +43,16 @@
         return handleApprovalStatus(page, request);
     }
 
+    //可打印：只需要查询可打印状态即可
+    //查询工作流
     private Page<CertificateListResponse> handleApprovalStatus(Page<CertificateListResponse> page, CertificateListRequest request) {
         Page<CertificateListResponse> approvalList = PageFactory.defaultPage();
         List<String> businessKeys = new ArrayList<>();
         List<BusinessCertificateReport> list;
+        //先进行可打印的操作，如果是可打印操作，则直接返回所有的值
+        if (request.getPrintStatus().equals("0")) {
+            return getPrintableList(page, request);
+        }
         switch (request.getApprovalStatus()) {
             //待审批，该状态维护在flowable中
             case ApprovalStatusEnum.TO_BE_APPROVED:
@@ -58,8 +61,8 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.TO_BE_APPROVED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList,ApprovalStatusEnum.TO_BE_APPROVED);
                     //DTO根据业务主键补全taskId
                     approvalList.getRecords().forEach(approval -> {
                         toBeApprovedList.forEach(toBeApprovedDTO -> {
@@ -76,16 +79,16 @@
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.IN_APPROVED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList, ApprovalStatusEnum.IN_APPROVED);
                 }
 //                break;
-            //已通过，该状态维护在flowable
+                //已通过，该状态维护在flowable
             case ApprovalStatusEnum.PASSED:
                 businessKeys = baseApprovalService.getPassedList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.PASSED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList,ApprovalStatusEnum.PASSED);
                 }
                 break;
             //未通过（包括拒绝、驳回，拒绝为直接删除实例，驳回为驳回到起点），该状态维护在flowable
@@ -93,13 +96,13 @@
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.FAILED);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
                 }
                 Page<CertificateListResponse> rejectApprovalList = PageFactory.defaultPage();
                 if (!CollectionUtils.isEmpty(rejectBusinessKey)) {
-                    List<BusinessCertificateReport> rejectList = this.baseMapper.selectBatchForApprovalList(page, request, rejectBusinessKey);
-                    rejectApprovalList = handleApprovalListResponse(approvalList, rejectList, ApprovalStatusEnum.FAILED_REJECT);
+                    rejectApprovalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, rejectBusinessKey));
+                    handleApprovalListResponse(rejectApprovalList, ApprovalStatusEnum.FAILED_REJECT);
                 }
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.getRecords().addAll(rejectApprovalList.getRecords());
@@ -113,18 +116,22 @@
                     businessKeys = AllApproveList.stream().map(AllApproveDTO::getBusinessKey).collect(Collectors.toList());
                 }
                 if (!CollectionUtils.isEmpty(businessKeys)) {
-                    list = this.baseMapper.selectBatchForApprovalList(page, request, businessKeys);
-                    approvalList = handleAllApprovalListResponse(approvalList, list, AllApproveList);
+                    approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys));
+                    approvalList = handleAllApprovalListResponse(approvalList, AllApproveList);
                 }
                 break;
         }
         return approvalList;
     }
 
-    private Page<CertificateListResponse> handleAllApprovalListResponse(Page<CertificateListResponse> approvalList, List<BusinessCertificateReport> list, List<AllApproveDTO> allApproveList) {
+    private Page<CertificateListResponse> getPrintableList(Page<CertificateListResponse> page, CertificateListRequest request) {
+        page.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, null));
+        return page;
+    }
 
-        Map<String, String> taskMap = allApproveList.stream().collect(Collectors.toMap(AllApproveDTO::getBusinessKey,AllApproveDTO::getStatus));
-        approvalList.setRecords(ConvertUtils.sourceToTarget(list, CertificateListResponse.class));
+
+    private Page<CertificateListResponse> handleAllApprovalListResponse(Page<CertificateListResponse> approvalList, List<AllApproveDTO> allApproveList) {
+        Map<String, String> taskMap = allApproveList.stream().collect(Collectors.toMap(AllApproveDTO::getBusinessKey, AllApproveDTO::getStatus));
         //状态补全
         approvalList.getRecords().forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
@@ -135,13 +142,11 @@
         return approvalList;
     }
 
-    private Page<CertificateListResponse> handleApprovalListResponse(Page<CertificateListResponse> approvalList, List<BusinessCertificateReport> list, String status) {
-        approvalList.setRecords(ConvertUtils.sourceToTarget(list, CertificateListResponse.class));
+    private void handleApprovalListResponse(Page<CertificateListResponse> approvalList, String status) {
         approvalList.getRecords().stream().forEach(result -> {
             //审批状态两种获取方式：1、在此处设置，2、在flowable中设置业务状态，暂采取1
             result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, status));
         });
-        return approvalList;
     }
 
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index ef32d16..ed9ef9b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -70,7 +70,7 @@
             customerSampleList.add(customerSampleInfo);
         }
         businessExchange.setCustomerSampleInfoList(customerSampleList);
-        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        return businessExchange;
     }
 
     @Override
@@ -87,7 +87,13 @@
     @Override
     public ReturnDTO updateExchange(BusinessInterchange businessInterchange) {
         Integer updateFlag = this.baseMapper.updateById(businessInterchange);
-        if (updateFlag > 0) {
+        Boolean samplUpdateFlag = true;
+        if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleInfoList())) {
+            for (CustomerSampleInfo sampleInfo : businessInterchange.getCustomerSampleInfoList()) {
+                samplUpdateFlag = samplUpdateFlag && sampleStatusUpdator(sampleInfo, businessInterchange.getOrderId()) > 0;
+            }
+        }
+        if (updateFlag > 0 && samplUpdateFlag) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -96,10 +102,13 @@
     @Override
     public ReturnDTO addExchange(BusinessInterchange businessInterchange) {
         populationExchange(businessInterchange);
+
         Integer addFlag = this.baseMapper.insert(businessInterchange);
         Boolean sampleAddFlag = true;
-        for (CustomerSampleInfo sampleInfo : businessInterchange.getCustomerSampleInfoList()) {
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(businessInterchange.getOrderId(), sampleInfo.getId(), "2") > 0;
+        if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleInfoList())) {
+            for (CustomerSampleInfo sampleInfo : businessInterchange.getCustomerSampleInfoList()) {
+                sampleAddFlag = sampleAddFlag && sampleStatusCreator(businessInterchange.getOrderId(), sampleInfo.getId(), "2") > 0;
+            }
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -112,7 +121,7 @@
         try {
             List<InterchangeListResponse> resultPage;
             if (!CollectionUtils.isEmpty(request.getIds())) {
-                resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
+                resultPage = businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
             } else {
                 Page<InterchangeListResponse> page = PageFactory.defaultPage();
                 page.setCurrent(1);
@@ -126,7 +135,7 @@
         }
     }
 
-    private void  populationExchange(BusinessInterchange businessInterchange){
+    private void populationExchange(BusinessInterchange businessInterchange) {
         Long maxNo = this.baseMapper.selectMaxExchangeNo();
         String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo);
         AuthUser authUser = ShiroKit.getUser();
@@ -144,9 +153,20 @@
         return sampleStatus;
     }
 
+    private Integer sampleStatusUpdator(CustomerSampleInfo customerSampleInfo,Long orderId) {
+        QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("order_id",orderId);
+        queryWrapper.eq(ObjectUtil.isEmpty(customerSampleInfo.getId()), "id", customerSampleInfo.getId());
+        BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
+//        sampleStatusPopulation.setSampleStatus(status);
+//        sampleStatusPopulation.setSampleStatus(status);
+        Integer sampleStatus = this.sampleRelationMapper.update(sampleStatusPopulation, queryWrapper);
+        return sampleStatus;
+    }
+
     private Integer sampleStatusDeletor(Long orderId, String status) {
         QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ObjectUtil.isEmpty(orderId), "order_id", orderId);
+        queryWrapper.eq(ObjectUtil.isNotEmpty(orderId), "order_id", orderId);
         queryWrapper.eq("status", "2");
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setSampleStatus(status);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 5eb0a4b..4b54a20 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -186,8 +186,8 @@
 
     private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {
         QueryWrapper<BusinessCertificateReport> wrapper = new QueryWrapper<>();
-        wrapper.eq("orderId", dispatchVO.getOrderId());
-        wrapper.eq("sampleId", dispatchVO.getSampleId());
+        wrapper.eq("order_id", dispatchVO.getOrderId());
+        wrapper.eq("sample_id", dispatchVO.getSampleId());
         wrapper.eq("measure_dept_id", deptId);
         return wrapper;
     }