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/restaurant/ReScoreItem10.kt | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt
index 10faf8d..a7447ff 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt
@@ -38,31 +38,26 @@
* 3.鏀跺埌鎵ф硶鎰忚涔�
* 4.鏈夌幆澧冭繚娉曡涓轰笖鍙楀埌琛屾斂澶勭綒
*/
- override fun otherProblem(size: Int): Int? {
+ override fun otherProblem(size: Int): List<Int>? {
val time = evaluationScene.subTask.value?.planstarttime
val lt = LocalDateTime.ofInstant(time?.toInstant(), ZoneId.systemDefault())
val s = lt.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0)
val e = s.plusMonths(1)
- var i = 1
+ var i = 0
when {
condition3(s, e) -> {
i = 3
- if (i > size - 1) i = size - 1
- return i
}
condition2(s, e) -> {
i = 2
- if (i > size - 1) i = size - 1
- return i
}
condition1(s, e) -> {
i = 1
- if (i > size - 1) i = size - 1
- return i
}
- else -> return null
}
+ if (i > size - 1) i = size - 1
+ return listOf(i)
}
/**
--
Gitblit v1.9.3