From 274bc2d0f7fe8fe7525196e4d7d6ece1cafe2c6c Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期日, 04 二月 2024 17:32:14 +0800 Subject: [PATCH] 1. 新增静安50分制评估结果转换逻辑; 2. 新增根据坐标圆心和半径查询范围内场景逻辑; --- src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt index 8dba496..14eccea 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt @@ -5,7 +5,9 @@ import cn.flightfeather.supervision.lightshare.vo.AreaVo import org.springframework.stereotype.Repository import java.time.LocalDate +import java.time.LocalDateTime import java.time.ZoneId +import java.time.format.DateTimeFormatter import java.util.* @Repository @@ -13,7 +15,7 @@ private fun exampleTask(areaVo: AreaVo): Task?{ areaVo.starttime ?: return null - val mStart = LocalDate.parse(areaVo.starttime).withDayOfMonth(1).atStartOfDay() + val mStart = areaVo.starttime!!.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0) val mEnd = mStart.plusMonths(1).minusSeconds(1) return Task().apply { provincecode = areaVo.provincecode -- Gitblit v1.9.3