From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:13:35 +0800
Subject: [PATCH] 1. 环信码生成时，如果在线场景当期没有评估（未巡查）结果，则延用历史最新一次的结果； 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/construction/JAScore.kt | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/construction/JAScore.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/construction/JAScore.kt
index dda636a..87752c3 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/construction/JAScore.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/construction/JAScore.kt
@@ -15,12 +15,9 @@
* 鏍规嵁鑷姩璇勫垎缁撴灉杩涜杞崲寰楀嚭
*/
@Component
-class JAScore {
+class JAScore(private val scoreMapper: ScoreMapper) {
- @Autowired
- lateinit var scoreMapper: ScoreMapper
-
- fun toDb(e: Evaluation, info: Info) {
+ fun toDb(e: Evaluation, isEnable: Boolean) {
val time = LocalDateTime.ofInstant(e.evaluatetime?.toInstant(), ZoneId.systemDefault())
val scoreVo = Score().apply {
sceneId = e.sguid
@@ -30,7 +27,7 @@
districtCode = e.districtcode
districtName = e.districtname
score = transform(e.resultscorebef?.toIntOrNull() ?: 0)
- completion = !info.online
+ completion = !isEnable
}
val res = scoreMapper.selectByExample(Example(Score::class.java).apply {
@@ -51,7 +48,7 @@
*/
private fun transform(oldS: Int): Int {
return when {
- // 鍩烘湰瑙勮寖
+ // 鍩烘湰瑙勮寖(90..94)鍜岃鑼冿紙>=95锛�
oldS >= 90 -> 50
// 涓嶈鑼�
oldS >= 50 -> 30
--
Gitblit v1.9.3