diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java index dd1420dc..66ef90a0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java @@ -18,6 +18,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -38,7 +40,24 @@ public class EnterpriseStandardRecheckPlanServiceImpl extends ServiceImpl queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); - return esRecheckPlanMapper.page(page, esRecheckPlan); + // 遍历数据 如果当前时间超过复审日期7天,则显示下一次复审日期 + List records = esRecheckPlanMapper.page(page, esRecheckPlan).getRecords(); + records.forEach(recheckPlan -> { + // 获取复审日期前7天的时间戳 + long sevenDaysBeforeRecheck = recheckPlan.getRecheckDate().getTime() - (7L * 24 * 60 * 60 * 1000); + // 检查当前时间是否在复审日期前7天内 + if (System.currentTimeMillis() >= sevenDaysBeforeRecheck) { + // 获取发布日期 + Date releaseDate = recheckPlan.getReleaseDate(); + // 使用Calendar进行日期的加减 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(releaseDate); // 设置发布日期 + calendar.add(Calendar.YEAR, 6); // 在发布日期的基础上加三年 + // 将新的复审日期设置回对象中 + recheckPlan.setRecheckDate(calendar.getTime()); + } + }); + return page.setRecords(records); } }