From b6c29718e10e25a6a49fe9538f554371e1560720 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 25 七月 2022 15:50:22 +0800
Subject: [PATCH] 1. 调试监管统计文件下载接口; 2. 新增自动评分刷新接口; 3. 针对前端页面,调整部分接口

---
 src/main/kotlin/cn/flightfeather/supervision/business/storage/StAutoScore.kt |   15 +++++++++------
 1 files changed, 9 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..81d8739 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
@@ -29,8 +29,10 @@
  * 宸ュ湴鑷姩璇勫垎
  */
 @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 +95,7 @@
 
     init {
         itemList.add(stScoreItem_1)
+        itemList.add(stScoreItem_2)
     }
 
     @PostConstruct
@@ -110,10 +113,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