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