From 16b961c2210fe29fd494ac1f9d830dd93503961f Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期五, 02 八月 2024 17:25:17 +0800 Subject: [PATCH] 1. 新增监测设备的管理功能 --- src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/ScoreItem.kt | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/ScoreItem.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/ScoreItem.kt index 4a50913..a394739 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/ScoreItem.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/ScoreItem.kt @@ -23,7 +23,6 @@ //鏈�灏忓垎鍊硷紙榛樿0鍒嗭級 var minScore: Int = 0 - val dateUtil = DateUtil() // 璇勫垎椤规槸鍚﹁眮鍏嶄笉鎵e垎 var exemption = false @@ -66,7 +65,7 @@ * @param size 浼犲叆璇勫垎鏉$洰鐨勬暟閲忥紝璇勫垎鏉$洰鎸夌収涓�瀹氳鍒欒繘琛屾帓搴� * @return 杩斿洖闇�瑕佹墸鍒嗙殑璇勫垎鏉$洰鐨勫簭鍙� */ - abstract fun otherProblem(size: Int): Int? + abstract fun otherProblem(size: Int): List<Int>? /** * 鑷姩璇勫垎璁$畻閫昏緫 @@ -77,7 +76,9 @@ return } - otherProblem(rulePair?.second!!.size)?.let {i-> rulePair?.second!![i].getScore() } + otherProblem(rulePair?.second!!.size)?.let { it.forEach {i -> + rulePair?.second!![i].getScore() + } } ScoreUtil.subRuleCal(rulePair) } -- Gitblit v1.9.3