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/lightshare/service/impl/SubtaskServiceImpl.kt | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 b4118b8..78b73e7 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
@@ -1,10 +1,7 @@
package cn.flightfeather.supervision.lightshare.service.impl
-import cn.flightfeather.supervision.business.AutoScore
-import cn.flightfeather.supervision.business.AutoScore2
import cn.flightfeather.supervision.business.storage.StAutoScore
-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.domain.ds1.entity.*
import cn.flightfeather.supervision.domain.ds1.mapper.*
import cn.flightfeather.supervision.common.utils.Constant
@@ -23,14 +20,21 @@
import java.util.*
@Service
-class SubtaskServiceImpl(val subtaskMapper: SubtaskMapper) : SubtaskService {
+class SubtaskServiceImpl(
+ private val subtaskMapper: SubtaskMapper,
+ private val mpScoreItem_1: MpScoreItem_1,
+ private val mpScoreItem_2: MpScoreItem_2,
+ private val stScoreItem_1: StScoreItem_1,
+ private val whScoreItem_1: WhScoreItem_1,
+ private val whScoreItem_2: WhScoreItem_2,
+) : SubtaskService {
val dateUtil = DateUtil()
@Autowired
- lateinit var scoreItem1: StScoreItem_1
+ lateinit var scoreItem1: CsScoreItem_1
@Autowired
- lateinit var scoreItem2: StScoreItem_2
+ lateinit var scoreItem2: CsScoreItem_2
@Autowired
lateinit var taskService: TaskService
@Autowired
@@ -482,7 +486,7 @@
// autoScore.calculateScore()
// }
val s = scenseMapper.selectByPrimaryKey(subtask.scenseid)
- val autoScore = StAutoScore(scoreItem1, scoreItem2)
+ val autoScore = StAutoScore(scoreItem1, scoreItem2, mpScoreItem_1, mpScoreItem_2, stScoreItem_1, whScoreItem_1, whScoreItem_2)
autoScore.sceneType = Constant.ScenseType.getByValue(s.typeid?.toString())
autoScore.sceneGrade(subtask)
}
--
Gitblit v1.9.3