From 30d46d06fb4153e48df281d3008ed90935b3c06d Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 19 七月 2022 16:45:08 +0800
Subject: [PATCH] 1. 新增扬尘监测数据超标情况表
---
src/main/kotlin/cn/flightfeather/supervision/business/storage/StAutoScore.kt | 14 ++++++++------
1 files changed, 8 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 c776371..979bcc0 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/storage/StAutoScore.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/storage/StAutoScore.kt
@@ -2,6 +2,8 @@
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.common.utils.Constant
import cn.flightfeather.supervision.common.utils.DateUtil
import cn.flightfeather.supervision.common.utils.ExcelUtil
@@ -17,8 +19,6 @@
import tk.mybatis.mapper.entity.Example
import java.io.File
import java.io.FileOutputStream
-import java.time.LocalDate
-import java.time.LocalDateTime
import java.util.*
import javax.annotation.PostConstruct
import kotlin.math.abs
@@ -30,7 +30,8 @@
*/
@Component
class StAutoScore(
- stScoreItem_1: ScoreItem,
+ stScoreItem_1: StScoreItem_1,
+ stScoreItem_2: StScoreItem_2,
var sceneType: Constant.ScenseType = Constant.ScenseType.TYPE1, )
{
companion object {
@@ -93,6 +94,7 @@
init {
itemList.add(stScoreItem_1)
+ itemList.add(stScoreItem_2)
}
@PostConstruct
@@ -110,10 +112,10 @@
fun topTaskGrade(topTaskId:String) {
rows.clear()
subtaskMapper.selectByTopTask2(topTaskId, sceneType.value.toInt()).forEach {
-// sceneGrade(it)
- sceneGradeToFile(it)
+ sceneGrade(it)
+// sceneGradeToFile(it)
}
- toFile()
+// toFile()
}
/**
--
Gitblit v1.9.3