From a5cdbf569067822e3232d2177b8a9aac1ed95b69 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 29 五月 2024 17:32:00 +0800
Subject: [PATCH] 1. 修改自评逻辑中，问题整改的判断方式为已整改并且整改审核通过； 2. 新增评估详情获取接口;
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/wharf/WhScoreItem2.kt | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/wharf/WhScoreItem2.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/wharf/WhScoreItem2.kt
index d7e18d6..0acdeed 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/wharf/WhScoreItem2.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/wharf/WhScoreItem2.kt
@@ -40,7 +40,7 @@
* 1.鐩戞祴鏁版嵁鍑虹幇鍗曟棩鍙婁互涓婃湁鏁堣秴鏍�
* 2.鐩戞祴鏁版嵁鏈堝潎鍊艰秴鍖哄煙鏈堝潎鍊�20%浠ヤ笂鎴栨暟鎹槑鏄惧紓甯�
*/
- 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)
@@ -51,14 +51,14 @@
.andEqualTo("drSceneId", evaluationScene.scene.value?.guid)
})
- var result: Int? = null
+ var result = mutableListOf<Int>()
r.forEach {
if (it == null) return@forEach
if (it.drExceedTimes > 0) {
- result = 0
+ result.add(0)
}
if (it.drOverAvgPer > 0.2) {
- result = 1
+ result.add(1)
}
}
--
Gitblit v1.9.3