diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
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 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
index 12bedc0..51b52e9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportStatusPostProcessor.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.listeners.processor;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.dto.flowable.NotifyEventStatusDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -8,15 +9,18 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.listeners.NotifyStatusPostProcessor;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
+import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
  * @author zt
- *
+ * <p>
  * 证书报告审批通过状态回填
  */
 @Service(ActionStatusBeanEnum.CERTIFICATE_REPORT_BEAN_NAME)
@@ -28,10 +32,25 @@
         Assert.isFalse(Objects.isNull(id), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-//         IBusinessCertificateReportServicecertificateReportService = SpringContextUtil.getBean(IBusinessCertificateReportService.class);
-//        if (!certificateReportService.updateCertificateReportState(id)) {
-//            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-//        }
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        CustomerSampleMapper sampleMapper = SpringContextUtil.getBean(CustomerSampleMapper.class);
+
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        //审批状态为通过
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED);
+        certificateReport.setUpdateTime(DateUtil.formatDateTime(new Date()));
+        int row = certificateReportMapper.updateById(certificateReport);
+        //更新样品有效期
+        BusinessCertificateReport certificateReport1 = certificateReportMapper.selectById(id);
+        if (certificateReport1.getSampleId() != null) {
+            CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
+            if (sampleInfo != null) {
+                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                int rs = sampleMapper.updateById(sampleInfo);
+                if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+            }
+        }
     }
 
 
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 719742d..d799779 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -96,42 +96,49 @@
     <select id="selectDraftListForApproval"
             resultType="com.casic.missiles.dto.business.certificate.CertificateReportResponse">
         SELECT
-            bcr.*,
-            csi.sample_no AS sampleNo,
-            csi.sample_name AS sampleName,
-            csi.sample_model AS sampleModel,
-            csi.manufacturing_no AS manufacturingNo,
-            csi.measure_category AS measureCategory,
-            bo.order_code AS orderCode,
-            su.name AS measurePersonName
+        bcr.*,
+        csi.sample_no AS sampleNo,
+        csi.sample_name AS sampleName,
+        csi.sample_model AS sampleModel,
+        csi.manufacturing_no AS manufacturingNo,
+        csi.measure_category AS measureCategory,
+        bo.order_code AS orderCode,
+        su.name AS measurePersonName
         FROM business_certificate_report bcr
-            LEFT JOIN business_order bo
-            ON bcr.order_id=bo.id
-            LEFT JOIN customer_sample_info csi
-            ON bcr.sample_id=csi.id
-            LEFT JOIN sys_user su
-            ON bcr.measure_person_id=su.id
+        LEFT JOIN business_order bo
+        ON bcr.order_id=bo.id
+        LEFT JOIN customer_sample_info csi
+        ON bcr.sample_id=csi.id
+        LEFT JOIN sys_user su
+        ON bcr.measure_person_id=su.id
         WHERE bcr.is_del = 0
-            AND approval_status = #{request.approvalStatus}
-            AND bcr.create_user = #{request.createUserId}
-            <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
-                and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
-            </if>
-            <if test="request.orderCode != null and request.orderCode !=''">
-                and bo.order_code like concat('%',#{request.orderCode},'%')
-            </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                and bo.customer_name like concat('%',#{request.customerName},'%')
-            </if>
-            <if test="request.sampleNo != null and request.sampleNo !=''">
-                and csi.sample_no like concat('%',#{request.sampleNo},'%')
-            </if>
-            <if test="request.sampleName != null and request.sampleName !=''">
-                and csi.sample_name like concat('%',#{request.sampleName},'%')
-            </if>
-            <if test="request.measureCategory != null and request.measureCategory !=''">
-                and csi.measure_category like concat('%',#{request.measureCategory},'%')
-            </if>
+        AND approval_status = #{request.approvalStatus}
+        AND bcr.create_user = #{request.createUserId}
+        <if test="request.certificateReportCode != null and request.certificateReportCode !=''">
+            and bcr.certificate_report_code like concat('%',#{request.certificateReportCode},'%')
+        </if>
+        <if test="request.orderCode != null and request.orderCode !=''">
+            and bo.order_code like concat('%',#{request.orderCode},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            and bo.customer_name like concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            and csi.sample_no like concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            and csi.sample_name like concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.measureCategory != null and request.measureCategory !=''">
+            and csi.measure_category like concat('%',#{request.measureCategory},'%')
+        </if>
+        <if test="request.ids != null ">
+            and bcr.id in
+            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
     </select>
 
     <select id="selectBatchForApproval"
@@ -171,10 +178,23 @@
             <if test="request.measureCategory != null and request.measureCategory !=''">
                 and csi.measure_category like concat('%',#{request.measureCategory},'%')
             </if>
-            and bcr.id in
-            <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+
+            <choose>
+
+                <when test="request.ids != null ">
+                    and bcr.id in
+                    <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </when>
+
+                <otherwise>
+                    and bcr.id in
+                    <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
+                        #{id}
+                    </foreach>
+                </otherwise>
+            </choose>
 
     </select>
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 5e59e2e..55b77fe 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -268,7 +268,7 @@
             if (sampleInfo != null) {
                 sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
                 boolean rs = sampleService.updateById(sampleInfo);
-                if (row > 0 & rs) return true;
+                if (row > 0 && rs) return true;
             }
         }
         return row > 0 ? true : false;