From 4c7e2d8f8d4a93f318ada0e728dbc370e7504e92 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 14 七月 2022 17:49:40 +0800
Subject: [PATCH] 1. 自动评分优化； 2. 巡查汇总报告功能编写中
---
src/main/kotlin/cn/flightfeather/supervision/business/ScoreItem.kt | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/ScoreItem.kt b/src/main/kotlin/cn/flightfeather/supervision/business/ScoreItem.kt
index 5430316..71db5bc 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/ScoreItem.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/ScoreItem.kt
@@ -84,13 +84,13 @@
evaluationsubruleList.forEach {
if (it.fatherid == id) {
// 鏍规嵁瑙勫垯瀵瑰簲鐨勭浉鍏抽棶棰榠d锛屾煡鎵剧敤鎴峰湪褰撳墠鏃堕棿娈靛唴鏄惁鏈夊彂鐢熻闂锛屾湁鍒欐墸闄ょ浉搴旂殑鍒嗘暟
- it.problemlist?.let {pId ->
- problemlistMapper.selectByExample(Example(Problemlist::class.java).apply {
- createCriteria().andEqualTo("sguid", info.sceneId)
- .andEqualTo("ptguid", pId)
- .andGreaterThanOrEqualTo("time", info.sTime)
- .andLessThan("time", info.eTime)
- })?.takeIf { p-> p.isNotEmpty() }?.run {
+ val pList = problemlistMapper.selectByExample(Example(Problemlist::class.java).apply {
+ createCriteria().andEqualTo("sguid", info.sceneId)
+ .andGreaterThanOrEqualTo("time", info.sTime)
+ .andLessThan("time", info.eTime)
+ }).map { p-> p.ptguid }
+ it.problemlist?.split(",")?.forEach {pId ->
+ if (pList.contains(pId)) {
it.extension1 = (0 - (it.maxscore ?: 0)).toString()
}
}
--
Gitblit v1.9.3