From 909fd8929d7906f1dca68acc05e36e29b0b9192c Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 15 十一月 2022 10:57:30 +0800
Subject: [PATCH] 2022.11.15
---
src/main/kotlin/cn/flightfeather/supervision/business/storage/StAutoScore.kt | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/storage/StAutoScore.kt b/src/main/kotlin/cn/flightfeather/supervision/business/storage/StAutoScore.kt
index 81d8739..60e48b5 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/storage/StAutoScore.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/storage/StAutoScore.kt
@@ -2,8 +2,7 @@
import cn.flightfeather.supervision.business.Info
import cn.flightfeather.supervision.business.ScoreItem
-import cn.flightfeather.supervision.business.storage.item.StScoreItem_1
-import cn.flightfeather.supervision.business.storage.item.StScoreItem_2
+import cn.flightfeather.supervision.business.storage.item.*
import cn.flightfeather.supervision.common.utils.Constant
import cn.flightfeather.supervision.common.utils.DateUtil
import cn.flightfeather.supervision.common.utils.ExcelUtil
@@ -31,8 +30,13 @@
@Component
class StAutoScore(
+ csScoreItem_1: CsScoreItem_1,
+ csScoreItem_2: CsScoreItem_2,
+ mpScoreItem_1: MpScoreItem_1,
+ mpScoreItem_2: MpScoreItem_2,
stScoreItem_1: StScoreItem_1,
- stScoreItem_2: StScoreItem_2,
+ whScoreItem_1: WhScoreItem_1,
+ whScoreItem_2: WhScoreItem_2,
var sceneType: Constant.ScenseType = Constant.ScenseType.TYPE1, )
{
companion object {
@@ -94,8 +98,15 @@
private val rows = mutableListOf<Array<Any>>()
init {
- itemList.add(stScoreItem_1)
- itemList.add(stScoreItem_2)
+ itemList.apply {
+ add(csScoreItem_1)
+ add(csScoreItem_2)
+ add(mpScoreItem_1)
+ add(mpScoreItem_2)
+ add(stScoreItem_1)
+ add(whScoreItem_1)
+ add(whScoreItem_2)
+ }
}
@PostConstruct
@@ -112,8 +123,9 @@
*/
fun topTaskGrade(topTaskId:String) {
rows.clear()
+ getScoreItem()
subtaskMapper.selectByTopTask2(topTaskId, sceneType.value.toInt()).forEach {
- sceneGrade(it)
+ sceneGradeP(it)
// sceneGradeToFile(it)
}
// toFile()
@@ -127,6 +139,10 @@
// 鑾峰彇璇勫垎瑙勫垯
getScoreItem()
+ sceneGradeP(subtask)
+ }
+
+ private fun sceneGradeP(subtask: Subtask) {
val info = itemGrade(subtask)
val result = totalGrade(info) ?: return
toDb(info, result)
@@ -141,6 +157,9 @@
val info = itemGrade(subtask)
val result = totalGrade(info) ?: return
addToFile(rows, info, result.first)
+ }
+
+ fun grade(subtask: Subtask) {
}
--
Gitblit v1.9.3