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/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