From c1becf4cbd2e99601ce011c14b8742427249cfb4 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 09 一月 2024 17:25:05 +0800 Subject: [PATCH] 1. 多项调整 --- src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt index 10faf8d..d7b7b88 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt @@ -38,7 +38,7 @@ * 3.鏀跺埌鎵ф硶鎰忚涔� * 4.鏈夌幆澧冭繚娉曡涓轰笖鍙楀埌琛屾斂澶勭綒 */ - override fun otherProblem(size: Int): Int? { + override fun otherProblem(size: Int): List<Int>? { val time = evaluationScene.subTask.value?.planstarttime val lt = LocalDateTime.ofInstant(time?.toInstant(), ZoneId.systemDefault()) val s = lt.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0) @@ -48,21 +48,16 @@ when { condition3(s, e) -> { i = 3 - if (i > size - 1) i = size - 1 - return i } condition2(s, e) -> { i = 2 - if (i > size - 1) i = size - 1 - return i } condition1(s, e) -> { i = 1 - if (i > size - 1) i = size - 1 - return i } - else -> return null } + if (i > size - 1) i = size - 1 + return listOf(i) } /** -- Gitblit v1.9.3