ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 企标复审三年时间

Browse Source
This commit is contained in:
mzaxd
2023-11-09 12:00:28 +08:00
parent 2488f75104
commit a3660770d1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java
+3 -2
View File
@@ -39,7 +39,7 @@ public class ESRecheckPlanJob implements Job {
List<LawsEnterpriseStandard> allEs = esService.list(new LambdaQueryWrapper<LawsEnterpriseStandard>().eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue())); List<LawsEnterpriseStandard> allEs = esService.list(new LambdaQueryWrapper<LawsEnterpriseStandard>().eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue()));
List<EnterpriseStandardRecheckPlan> recheckPlanList = esRecheckPlanService.list(); List<EnterpriseStandardRecheckPlan> recheckPlanList = esRecheckPlanService.list();
Map<String, List<EnterpriseStandardRecheckPlan>> recheckPlanMap = recheckPlanList.stream().collect(Collectors.groupingBy(EnterpriseStandardRecheckPlan::getId)); Map<String, List<EnterpriseStandardRecheckPlan>> recheckPlanMap = recheckPlanList.stream().collect(Collectors.groupingBy(EnterpriseStandardRecheckPlan::getStandardId));
for (LawsEnterpriseStandard es : allEs) { for (LawsEnterpriseStandard es : allEs) {
// 根据企标发布日期判断是否当前已经达到35个月 // 根据企标发布日期判断是否当前已经达到35个月
@@ -51,7 +51,7 @@ public class ESRecheckPlanJob implements Job {
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
// 36个月的复审日期 // 36个月的复审日期
LocalDate recheckDate36Months = releaseLocalDate.plusMonths(36); LocalDate recheckDate36Months = releaseLocalDate.plusMonths(36);
LocalDate plusMonths = releaseLocalDate.plusMonths(35); LocalDate plusMonths = releaseLocalDate.plusMonths(35).minusDays(1);
if (plusMonths.isBefore(now)) { if (plusMonths.isBefore(now)) {
// 判断是否已经存在复审计划 // 判断是否已经存在复审计划
List<EnterpriseStandardRecheckPlan> recheckPlans = recheckPlanMap.get(es.getId()); List<EnterpriseStandardRecheckPlan> recheckPlans = recheckPlanMap.get(es.getId());
@@ -62,6 +62,7 @@ public class ESRecheckPlanJob implements Job {
recheckPlan.setStandardNo(es.getStandardNumber()); recheckPlan.setStandardNo(es.getStandardNumber());
// 正确处理时区，转换回Date类型 // 正确处理时区，转换回Date类型
ZonedDateTime zdtRecheck = recheckDate36Months.atStartOfDay(ZoneId.of("Asia/Shanghai")); ZonedDateTime zdtRecheck = recheckDate36Months.atStartOfDay(ZoneId.of("Asia/Shanghai"));
// 加一天
Date recheckDate = Date.from(zdtRecheck.toInstant()); Date recheckDate = Date.from(zdtRecheck.toInstant());
recheckPlan.setRecheckDate(recheckDate); recheckPlan.setRecheckDate(recheckDate);
esRecheckPlanService.save(recheckPlan); esRecheckPlanService.save(recheckPlan);