From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001 From: hcong <1050828145@qq.com> Date: 星期二, 17 十二月 2024 11:41:00 +0800 Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象 --- 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