diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index e028713..f51b9cd 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -174,7 +174,7 @@
 
 
         <!-- https://mvnrepository.com/artifact/e-iceblue/spire.office -->
-        <dependency>
+            <dependency>
             <groupId>e-iceblue</groupId>
             <artifactId>spire.office.free</artifactId>
             <version>5.3.1</version>

diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index e028713..f51b9cd 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -174,7 +174,7 @@
 
 
         <!-- https://mvnrepository.com/artifact/e-iceblue/spire.office -->
-        <dependency>
+            <dependency>
             <groupId>e-iceblue</groupId>
             <artifactId>spire.office.free</artifactId>
             <version>5.3.1</version>
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportEventPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportEventPostProcessor.java
index 3404409..872da3e 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportEventPostProcessor.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportEventPostProcessor.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.utils.SpringContextUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -49,7 +50,13 @@
         if (certificateReport1.getSampleId() != null) {
             CustomerSampleInfo sampleInfo = sampleMapper.selectById(certificateReport1.getSampleId());
             if (sampleInfo != null) {
-                sampleInfo.setValidDeadline(certificateReport1.getExpirationDate());
+                //比较哪个时间更早
+                String endTime = sampleInfo.getValidDeadline();
+                if (StringUtils.isNotEmpty(endTime)) {
+                    endTime = DateUtil.compare(DateUtil.parseDateTime(endTime), DateUtil.parseDateTime(certificateReport1.getExpirationDate())) < 0 ?
+                            endTime : certificateReport1.getExpirationDate();
+                }
+                sampleInfo.setValidDeadline(StringUtils.isNotEmpty(endTime) ? endTime : certificateReport1.getExpirationDate());
                 int rs = sampleMapper.updateById(sampleInfo);
                 if (row < 1 || rs < 1) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
             }
@@ -59,8 +66,8 @@
         //进行证书报告生成，并在远程注册服务器注册
 //        PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
 //        String printFileName = printFileRegister.registerPrintFile(certificateReport);
-        String printFileName ="";
-                //生成证书打印信息
+        String printFileName = "";
+        //生成证书打印信息
         CertificatePrintBuilder(certificateReport, printFileName);
     }