From e844ef2fdab88508e7dff4bb9e7b1632fcce15b2 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 28 七月 2022 09:11:20 +0800
Subject: [PATCH] 1. 巡查统计清单调试

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt
index 2a26187..b4118b8 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt
@@ -472,17 +472,19 @@
             criteria.andEqualTo("stguid", subtask.stguid)
             val result = evaluationMapper.selectByExample(example)
             if (result.isEmpty()) {
-                if (subtask.districtname == "寰愭眹鍖�") {
-                    val autoScore = AutoScore2()
-                    autoScore.subtask = subtask
-                    autoScore.calculateScore()
-                } else {
-                    val autoScore = AutoScore()
-                    autoScore.subtask = subtask
-                    autoScore.calculateScore()
-                }
-//                val autoScore = StAutoScore(scoreItem1, scoreItem2)
-//                autoScore.sceneType = Constant.ScenseType.TYPE1
+//                if (subtask.districtname == "寰愭眹鍖�") {
+//                    val autoScore = AutoScore2()
+//                    autoScore.subtask = subtask
+//                    autoScore.calculateScore()
+//                } else {
+//                    val autoScore = AutoScore()
+//                    autoScore.subtask = subtask
+//                    autoScore.calculateScore()
+//                }
+                val s = scenseMapper.selectByPrimaryKey(subtask.scenseid)
+                val autoScore = StAutoScore(scoreItem1, scoreItem2)
+                autoScore.sceneType = Constant.ScenseType.getByValue(s.typeid?.toString())
+                autoScore.sceneGrade(subtask)
             }
         }
 

--
Gitblit v1.9.3