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 | 10 +++++----- 1 files changed, 5 insertions(+), 5 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 3d40ce8..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("鏂藉伐/钀ヨ繍鐘舵��"), @@ -21,19 +21,19 @@ var status: String? = "" var stage: String? = "" when (rowData.scene?.typeid.toString()) { - Constant.ScenseType.TYPE1.value -> { + Constant.SceneType.TYPE1.value -> { (rowData.baseScene as SceneConstructionSite?)?.apply { status = csStatus stage = siExtension1 } } - Constant.ScenseType.TYPE2.value -> { + Constant.SceneType.TYPE2.value -> { status = (rowData.baseScene as SceneWharf?)?.getwStatus() } - Constant.ScenseType.TYPE3.value -> { + Constant.SceneType.TYPE3.value -> { status = (rowData.baseScene as SceneMixingPlant?)?.mpStatus } - Constant.ScenseType.TYPE14.value -> { + Constant.SceneType.TYPE14.value -> { status = (rowData.baseScene as SceneStorageYard?)?.syStatus } else -> "" -- Gitblit v1.9.3