From c55c9a51cea46caea88b2bee5cc3c9ddaa9fc468 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期三, 11 十二月 2024 08:44:22 +0800
Subject: [PATCH] 1. 新增 BaseExcel.kt 和 BaseTemplate.kt 的 toObject输出到对象方法 2. 新增 BaseTemplate 是否执行的状态属性 3. 在cn.flightfeather.supervision.business.report.bean包下新增 BaseTemplateResult.kt 结果对象抽象类 以及 ProAnalysisSummaryResult.kt 和 ProDetailSummaryResult.kt 对应实现：问题整改动态跟踪和分街镇问题整改分析的中间结果对象 注：除了问题整改动态跟踪和分街镇问题整改分析其他的汇总表对象中都没有对应中间结果对象，因此这里还有报错信息
---
src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem9.kt | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem9.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem9.kt
index 431585c..9b04fe1 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem9.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem9.kt
@@ -37,7 +37,7 @@
* 2.鏈搴﹀彂鐢熷崟娆″尯绾т俊璁挎姇璇�
* 3.鏈搴﹀彂鐢熷競绾т俊璁挎姇璇夋垨澶氭鍖虹骇淇¤銆佹姇璇夋垨鐩戠涓嶉厤鍚�
*/
- 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 st = lt.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0)
@@ -49,16 +49,14 @@
.andLessThan("cpTime", et)
})
- var i = 2
+ var i = 0
if (condition2(complaints)) {
- if (i > size - 1) i = size - 1
- return i
+ i = 2
} else if (condition1(complaints)) {
i = 1
- if (i > size - 1) i = size - 1
- return i
}
- return null
+ if (i > size - 1) i = size - 1
+ return listOf(i)
}
/**
--
Gitblit v1.9.3