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/report/cols/ColSceneName.kt | 18 ++++++++++++++----
1 files changed, 14 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 979b066..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,16 +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.index + 1, rowData.scene?.index ?: -99, 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