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/ColStatus.kt | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColStatus.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColStatus.kt
index da630da..05225f1 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColStatus.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/cols/ColStatus.kt
@@ -9,7 +9,7 @@
import cn.flightfeather.supervision.domain.ds1.entity.SceneStorageYard
import cn.flightfeather.supervision.domain.ds1.entity.SceneWharf
-class ColStatus : BaseCols() {
+class ColStatus(chooseIndexList: List<Int> = emptyList()) : BaseCols(chooseIndexList) {
override fun onHeads(dataSource: DataSource): MutableList<MutableList<ExcelUtil.MyCell>> {
return mutableListOf(mutableListOf(
ExcelUtil.MyCell("鏂藉伐/钀ヨ繍鐘舵��"),
@@ -18,22 +18,27 @@
}
override fun onOneRow(rowData: DataSource.RowData): List<Any> {
- val status = when (rowData.scene?.typeid.toString()) {
- Constant.ScenseType.TYPE1.value -> {
- (rowData.baseScene as SceneConstructionSite?)?.csStatus
+ var status: String? = ""
+ var stage: String? = ""
+ when (rowData.scene?.typeid.toString()) {
+ Constant.SceneType.TYPE1.value -> {
+ (rowData.baseScene as SceneConstructionSite?)?.apply {
+ status = csStatus
+ stage = siExtension1
+ }
}
- Constant.ScenseType.TYPE2.value -> {
- (rowData.baseScene as SceneWharf?)?.getwStatus()
+ Constant.SceneType.TYPE2.value -> {
+ status = (rowData.baseScene as SceneWharf?)?.getwStatus()
}
- Constant.ScenseType.TYPE3.value -> {
- (rowData.baseScene as SceneMixingPlant?)?.mpStatus
+ Constant.SceneType.TYPE3.value -> {
+ status = (rowData.baseScene as SceneMixingPlant?)?.mpStatus
}
- Constant.ScenseType.TYPE14.value -> {
- (rowData.baseScene as SceneStorageYard?)?.syStatus
+ Constant.SceneType.TYPE14.value -> {
+ status = (rowData.baseScene as SceneStorageYard?)?.syStatus
}
else -> ""
}
val s = status ?: ""
- return listOf(s, s)
+ return listOf(s, stage ?: "")
}
}
\ No newline at end of file
--
Gitblit v1.9.3