From c829c4991701213eaaa1c493c2b15b85c518ed67 Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Fri, 24 Feb 2023 11:33:39 +0800
Subject: [PATCH] bug fix

---
 .../java/org/springblade/common/utils/CommonDateUtil.java  | 7 +++++++
 .../business/service/impl/ApmRecordServiceImpl.java        | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springblade/common/utils/CommonDateUtil.java b/src/main/java/org/springblade/common/utils/CommonDateUtil.java
index b2eb05c..466dbbc 100644
--- a/src/main/java/org/springblade/common/utils/CommonDateUtil.java
+++ b/src/main/java/org/springblade/common/utils/CommonDateUtil.java
@@ -1,6 +1,7 @@
 package org.springblade.common.utils;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.BusinessConstant;
 import org.springblade.core.tool.utils.ConcurrentDateFormat;
 import org.springblade.core.tool.utils.DateUtil;
 
@@ -24,6 +25,12 @@ public class CommonDateUtil {
 		return sdf.format(DateUtil.now());
 	}
 
+	public static Date getDayStartString(Date date) {
+		String dayStartStr = DateUtil.format(date, DateUtil.PATTERN_DATE) + BusinessConstant.DATE_STR_DAY_START_HMS;
+
+		return DateUtil.parse(dayStartStr, DateUtil.PATTERN_DATETIME);
+	}
+
 	/**
 	 * 计算两个日期之间相差的天数
 	 *
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 61c3440..bbd6cdc 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
@@ -142,7 +142,7 @@ public class ApmRecordServiceImpl extends BaseServiceImpl<ApmRecordMapper, ApmRe
 			Wrappers.<ApmRecord>lambdaQuery()
 				.eq(ApmRecord::getCupCardNo, cupCardNo)
 				.eq(ApmRecord::getApmStatus, BusinessConstant.RECORD_STATUS_UNREGISTER)
-				.ge(ApmRecord::getApmDay, DateUtil.now())
+				.ge(ApmRecord::getApmDay, CommonDateUtil.getDayStartString(DateUtil.now()))
 		);
 
 		for (ApmRecord apmRecord : apmRecordList) {