From 23bd719cebe5feeff4e48fde925b0b39755eea93 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 15 十一月 2022 10:59:50 +0800 Subject: [PATCH] 2022.11.15 --- src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_5.kt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_5.kt b/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_5.kt index 6f1cf1a..acef8d3 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_5.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_5.kt @@ -7,6 +7,7 @@ import org.springframework.stereotype.Component import tk.mybatis.mapper.entity.Example import java.time.LocalDate +import java.time.LocalDateTime import java.time.ZoneId import java.util.* import javax.annotation.PostConstruct @@ -33,7 +34,8 @@ override fun calScore(): Pair<Int, Int> { val startTime = LocalDate.of(info.year, sMonth, 1).atStartOfDay(ZoneId.systemDefault()) - val lastTime = LocalDate.of(info.year, eMonth + 1, 1).atStartOfDay(ZoneId.systemDefault()) + val lastTime = LocalDate.of(info.year, eMonth, 1).plusMonths(1).atStartOfDay(ZoneId.systemDefault()) + LocalDateTime.now() val s = Date.from(startTime.toInstant()) val e = Date.from(lastTime.toInstant()) -- Gitblit v1.9.3