From f19bdfb2bb0d21d5d4d34e403f538f6f3143826e Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 13 Aug 2024 14:25:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8F=91=E6=96=B0=E8=AE=A4=E8=AF=81=E8=BD=A6=E5=9E=8B=E5=AE=9E?=
 =?UTF-8?q?=E6=96=BD=E5=88=B0=E6=9C=9F=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/ReplaceImplementationDateMsgJob.java  | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/job/ReplaceImplementationDateMsgJob.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/job/ReplaceImplementationDateMsgJob.java
index 6eeae0cb..d7eb4c9f 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/job/ReplaceImplementationDateMsgJob.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/job/ReplaceImplementationDateMsgJob.java
@@ -22,6 +22,7 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -79,7 +80,7 @@ public class ReplaceImplementationDateMsgJob implements Job {
         cal.add(Calendar.DAY_OF_YEAR, 1);
         Date tomorrowMidnight = cal.getTime();
 
-        // 根据新认证车实施日期筛选出已经到期的标准
+        // 根据实施日期筛选出已经到期的标准
         for (LawsEnterpriseStandard es : standardList) {
             Date implementationDate = es.getImplementationDate();
             if (implementationDate == null) {
@@ -168,14 +169,24 @@ public class ReplaceImplementationDateMsgJob implements Job {
         Date tomorrowMidnight = cal.getTime();
 
         // 根据新认证车实施日期筛选出已经到期的标准
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         for (LawsDomesticStandard gb : standardList) {
-            Date implementationDate = gb.getImplementationDate();
-            if (implementationDate == null) {
+            String newAuthImplDate = gb.getNewAuthImplDate();
+            if (StrUtil.isBlank(newAuthImplDate)) {
                 continue;
             }
+            String[] dateStrList = newAuthImplDate.split(",");
             // 判断实施日期大于今天0点小于明天0点
-            if (implementationDate.equals(todayMidnight) && implementationDate.before(tomorrowMidnight)) {
-                allExpireStandardNumberList.add(gb.getStandardNumber());
+            for (String dateStr : dateStrList) {
+                try {
+                    Date date = sdf.parse(dateStr);
+                    if (date.equals(todayMidnight) && date.before(tomorrowMidnight)) {
+                        allExpireStandardNumberList.add(gb.getStandardNumber());
+                        break;
+                    }
+                } catch (ParseException e) {
+                    log.error("日期转换异常", e);
+                }
             }
         }
 
@@ -205,7 +216,7 @@ public class ReplaceImplementationDateMsgJob implements Job {
             Map<String, String> sendMap = new HashMap<>();
             sendMap.put("standardNumber", mainStandard.getStandardNumber());
             sendMap.put("standardName", mainStandard.getStandardName());
-            sendMap.put("implementationDate", simpleDateFormat.format(mainStandard.getImplementationDate()));
+            sendMap.put("implementationDate", simpleDateFormat.format(new Date()));
 
             Set<String> userIdSet = new HashSet<>();
             // 拼接发送人员