From ee560147bc486334bc44ae5ef981582b3d393ae7 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 5 Aug 2024 10:12:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=96=E6=A0=87=E5=AE=9E=E6=96=BD?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=8F=91=E6=B6=88=E6=81=AF=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/ReplaceImplementationDateMsgJob.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 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 8899c33d..65eb56fd 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 @@ -147,15 +147,26 @@ public class ReplaceImplementationDateMsgJob implements Job { } Map standardMap = standardList.stream().collect(Collectors.toMap(LawsDomesticStandard::getId, es -> es)); + // 获取今天0点 + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.HOUR_OF_DAY, 0); + cal.set(Calendar.MINUTE, 0); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND, 0); + Date todayMidnight = cal.getTime(); + + // 获取明天0点 + cal.add(Calendar.DAY_OF_YEAR, 1); + Date tomorrowMidnight = cal.getTime(); + // 根据新认证车实施日期筛选出已经到期的标准 for (LawsDomesticStandard es : standardList) { Date implementationDate = es.getImplementationDate(); if (implementationDate == null) { continue; } - // 判断当前时间是否大于实施日期且实施日期没到后一天 - if (implementationDate.getTime() <= System.currentTimeMillis() && - implementationDate.before(new Date(implementationDate.getTime() + 24 * 60 * 60 * 1000))) { + // 判断实施日期大于今天0点小于明天0点 + if (implementationDate.equals(todayMidnight) && implementationDate.before(tomorrowMidnight)) { allExpireStandardNumberList.add(es.getStandardNumber()); } }