From a8dc7cd8d80254a7b91eebe58536300d6669f50b Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期二, 27 五月 2025 17:08:19 +0800 Subject: [PATCH] PointCumulateUnitEnum 增加this_day --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/common/PointCumulateUnitEnum.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/common/PointCumulateUnitEnum.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/common/PointCumulateUnitEnum.java index d8353c8..9b3d0d1 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/common/PointCumulateUnitEnum.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/common/PointCumulateUnitEnum.java @@ -1,6 +1,5 @@ package com.iailab.module.data.point.common; -import com.iailab.framework.common.util.date.DateUtils; import lombok.AllArgsConstructor; import lombok.Getter; @@ -27,6 +26,14 @@ DAY("day", (end, length) -> { Calendar cal = (Calendar) end.clone(); cal.add(Calendar.DAY_OF_MONTH, -length); + return cal; + }), + THIS_DAY("this_day", (end, length) -> { + Calendar cal = (Calendar) end.clone(); + cal.set(Calendar.HOUR_OF_DAY, 0); + cal.set(Calendar.MINUTE, 0); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND, 0); return cal; }), THIS_MONTH("this_month", (end, length) -> { @@ -67,7 +74,7 @@ } } - Calendar startCal = unit.calculate(endTime, length-1); + Calendar startCal = unit.calculate(endTime, length - 1); return startCal.getTime(); } } -- Gitblit v1.9.3