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 | 8 ++++---- 1 files changed, 4 insertions(+), 4 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 e84c977..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 @@ -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