From 29c9adb5baf6de222574b91ca8743077de39a0ab Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Mon, 6 Mar 2023 14:18:40 +0800 Subject: [PATCH] =?UTF-8?q?[bug]=E9=BB=91=E5=90=8D=E5=8D=95=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/utils/CommonDateUtil.java | 21 +++++++++++++++++++ .../controller/BlacklistController.java | 12 +++++++---- .../service/impl/ApmRecordServiceImpl.java | 2 +- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/springblade/common/utils/CommonDateUtil.java b/src/main/java/org/springblade/common/utils/CommonDateUtil.java index 466dbbc..41156aa 100644 --- a/src/main/java/org/springblade/common/utils/CommonDateUtil.java +++ b/src/main/java/org/springblade/common/utils/CommonDateUtil.java @@ -52,4 +52,25 @@ public class CommonDateUtil { return Integer.parseInt(String.valueOf(between_days)) + 1; } + /** + * 计算两个日期之间相差的天数, 不包含开始的天 + * + * @param sdate 较小的时间 + * @param edate 较大的时间 + * @return 相差天数 + * @throws ParseException + */ + public static int daysBetweenWithoutStartDay(Date sdate, Date edate) { + sdate = DateUtil.parse(DateUtil.format(sdate, DateUtil.PATTERN_DATE), DateUtil.PATTERN_DATE); + edate = DateUtil.parse(DateUtil.format(edate, DateUtil.PATTERN_DATE), DateUtil.PATTERN_DATE); + Calendar cal = Calendar.getInstance(); + cal.setTime(sdate); + long time1 = cal.getTimeInMillis(); + cal.setTime(edate); + long time2 = cal.getTimeInMillis(); + long between_days = (time2 - time1) / (1000 * 3600 * 24); + + return Integer.parseInt(String.valueOf(between_days)); + } + } diff --git a/src/main/java/org/springblade/modules/business/controller/BlacklistController.java b/src/main/java/org/springblade/modules/business/controller/BlacklistController.java index ae8e28d..66e947c 100644 --- a/src/main/java/org/springblade/modules/business/controller/BlacklistController.java +++ b/src/main/java/org/springblade/modules/business/controller/BlacklistController.java @@ -23,6 +23,8 @@ import org.springblade.modules.business.vo.BlacklistVO; import org.springblade.modules.business.wrapper.BlacklistWrapper; import org.springframework.web.bind.annotation.*; +import java.util.Date; + /** * 控制器 * @@ -89,14 +91,16 @@ public class BlacklistController extends BladeController { Blacklist blacklist = blacklistService.getLatelyRecord(cupCardNo); int blacklistOutdate = DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE); - if (Func.isNotEmpty(blacklist) && CommonDateUtil.daysBetween(blacklist.getCreateTime(), DateUtil.now()) < blacklistOutdate) { - int days = CommonDateUtil.daysBetween(blacklist.getCreateTime(), DateUtil.now()); + if (Func.isNotEmpty(blacklist) && CommonDateUtil.daysBetweenWithoutStartDay(blacklist.getCreateTime(), DateUtil.now()) < blacklistOutdate) { + // 更新提示信息为 +// int days = CommonDateUtil.daysBetweenWithoutStartDay(blacklist.getCreateTime(), DateUtil.now()); +// return R.data("由于您未及时进行报到，已被拉黑请于" + (blacklistOutdate - days) + "日后再次进行预约"); + Date date1 = DateUtil.plusDays(blacklist.getCreateTime(), blacklistOutdate + 1); - return R.data("由于您未及时进行报到，已被拉黑请于" + (blacklistOutdate - days) + "日后再次进行预约"); + return R.data("由于您未及时进行报到，已被拉黑请于" + DateUtil.format(date1, DateUtil.PATTERN_DATE) + "日后再次进行预约"); } return R.data(""); } - } diff --git a/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java index 3056a36..226eda5 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java @@ -123,7 +123,7 @@ public class ApmRecordServiceImpl extends BaseServiceImpl