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/ReScoreItem9.kt |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem9.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem9.kt
index 431585c..9b04fe1 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem9.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem9.kt
@@ -37,7 +37,7 @@
      *      2.鏈搴﹀彂鐢熷崟娆″尯绾т俊璁挎姇璇�
      *      3.鏈搴﹀彂鐢熷競绾т俊璁挎姇璇夋垨澶氭鍖虹骇淇¤銆佹姇璇夋垨鐩戠涓嶉厤鍚�
      */
-    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 st = lt.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0)
@@ -49,16 +49,14 @@
                 .andLessThan("cpTime", et)
         })
 
-        var i = 2
+        var i = 0
         if (condition2(complaints)) {
-            if (i > size - 1) i = size - 1
-            return i
+            i = 2
         } else if (condition1(complaints)) {
             i = 1
-            if (i > size - 1) i = size - 1
-            return i
         }
-        return null
+        if (i > size - 1) i = size - 1
+        return listOf(i)
     }
 
     /**

--
Gitblit v1.9.3