From a3660770d1642bc93bdefb4f5a33b0156a7a7af6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 9 Nov 2023 12:00:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E4=B8=89=E5=B9=B4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/laws/enterprise/job/ESRecheckPlanJob.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java index 76056d4c..34b4c037 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java @@ -39,7 +39,7 @@ public class ESRecheckPlanJob implements Job { List allEs = esService.list(new LambdaQueryWrapper().eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue())); List recheckPlanList = esRecheckPlanService.list(); - Map> recheckPlanMap = recheckPlanList.stream().collect(Collectors.groupingBy(EnterpriseStandardRecheckPlan::getId)); + Map> recheckPlanMap = recheckPlanList.stream().collect(Collectors.groupingBy(EnterpriseStandardRecheckPlan::getStandardId)); for (LawsEnterpriseStandard es : allEs) { // 根据企标发布日期判断是否当前已经达到35个月 @@ -51,7 +51,7 @@ public class ESRecheckPlanJob implements Job { LocalDate now = LocalDate.now(); // 36个月的复审日期 LocalDate recheckDate36Months = releaseLocalDate.plusMonths(36); - LocalDate plusMonths = releaseLocalDate.plusMonths(35); + LocalDate plusMonths = releaseLocalDate.plusMonths(35).minusDays(1); if (plusMonths.isBefore(now)) { // 判断是否已经存在复审计划 List recheckPlans = recheckPlanMap.get(es.getId()); @@ -62,6 +62,7 @@ public class ESRecheckPlanJob implements Job { recheckPlan.setStandardNo(es.getStandardNumber()); // 正确处理时区，转换回Date类型 ZonedDateTime zdtRecheck = recheckDate36Months.atStartOfDay(ZoneId.of("Asia/Shanghai")); + // 加一天 Date recheckDate = Date.from(zdtRecheck.toInstant()); recheckPlan.setRecheckDate(recheckDate); esRecheckPlanService.save(recheckPlan);