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/report/cols/ColSceneName.kt | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColSceneName.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColSceneName.kt
index 7e2cc48..8db38d5 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColSceneName.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColSceneName.kt
@@ -4,15 +4,26 @@
import cn.flightfeather.supervision.business.report.DataSource
import cn.flightfeather.supervision.common.utils.ExcelUtil
-//鍚嶇О
-class ColSceneName() : BaseCols() {
+//鍦烘櫙鍚嶇О鍙婄被鍨�
+class ColSceneName(chooseIndexList: List<Int> = emptyList()) : BaseCols(chooseIndexList) {
override fun onHeads(dataSource: DataSource): MutableList<MutableList<ExcelUtil.MyCell>> {
return mutableListOf(
- mutableListOf(ExcelUtil.MyCell("琛ㄥ崟缂栧彿"), ExcelUtil.MyCell("鍞竴搴忓彿"), ExcelUtil.MyCell("鍦烘櫙鍚嶇О"))
+ mutableListOf(
+ ExcelUtil.MyCell("琛ㄥ崟缂栧彿"),
+ ExcelUtil.MyCell("鍞竴搴忓彿"),
+ ExcelUtil.MyCell("鍦烘櫙绫诲瀷"),
+ ExcelUtil.MyCell("鍦烘櫙鍚嶇О")
+ )
)
}
override fun onOneRow(rowData: DataSource.RowData): List<Any> {
- return listOf(rowData.scene?.index ?: -99, rowData.scene?.extension2 ?: "", rowData.scene?.name ?: "")
+// return listOf(rowData.scene?.index ?: -99, rowData.scene?.extension2 ?: "", rowData.scene?.name ?: "")
+ return listOf(
+ rowData.index + 1,
+ rowData.scene?.index ?: -99,
+ rowData.scene?.type ?: "",
+ rowData.scene?.name ?: ""
+ )
}
}
\ No newline at end of file
--
Gitblit v1.9.3