From 196bb14112448857a885e32dc4149e308e00b01a Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期四, 15 八月 2024 11:57:15 +0800 Subject: [PATCH] 2024.8.15 各项修正 --- src/main/kotlin/cn/flightfeather/supervision/infrastructure/utils/DateUtil.kt | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/infrastructure/utils/DateUtil.kt b/src/main/kotlin/cn/flightfeather/supervision/infrastructure/utils/DateUtil.kt index bf4b724..f19633a 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/infrastructure/utils/DateUtil.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/infrastructure/utils/DateUtil.kt @@ -714,6 +714,31 @@ } } + /** + * 鏍规嵁缁欏畾鐨勫懆鏈燂紝杩斿洖鎵�鏈夊彲鑳藉湪鍛ㄦ湡鍐呯殑鍛ㄦ湡缁勫悎 + * @param period YYYY/M-M + */ + fun getSuitablePeriod(period: String?):List<String> { + var year:Int? = null + var sMonth:Int? = null + var eMonth:Int? = null + period?.split("/")?.takeIf { it.size == 2 }?.let { p -> + year = p[0].toIntOrNull() + p[1].split("-").takeIf { it.size == 2 }?.let { m-> + sMonth = m[0].toIntOrNull() + eMonth = m[1].toIntOrNull() + } + } + val result = mutableListOf<String>() + if (year != null && sMonth != null && eMonth != null) { + repeat(eMonth!! - sMonth!! + 1) { + result.add("${year}/${sMonth}-${sMonth}") + } + if (sMonth != eMonth) period?.let { result.add(it) } + } + return result + } + enum class DateStyle private constructor(val value: String, val isShowOnly: Boolean) { YYYYMMDD("yyyyMMdd", false), -- Gitblit v1.9.3