master
liuqingkun 3 years ago
parent 0a4ca04505
commit c829c49917
  1. 7
      src/main/java/org/springblade/common/utils/CommonDateUtil.java
  2. 2
      src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.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);
}
/**
* 计算两个日期之间相差的天数
*

@ -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) {

Loading…
Cancel
Save