From 9c315b4dbbb9f25d5373d1f228ed441a4e8ccbf7 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期四, 12 十二月 2024 15:31:00 +0800
Subject: [PATCH] 1. 数据产品中间结果基本信息和具体信息入库

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt
index b0fe633..77b2a75 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt
@@ -39,7 +39,8 @@
         val monitorobjectversionlist = monitorobjectversionMapper.select(monitorobjectversion)
 
         return monitorobjectversionlist.filter {
-            val usedCount = it.extension1 ?: "0";it.monitornum.toString().toInt() - usedCount.toInt() > 0
+            val usedCount = it.extension1 ?: "0"
+            it.monitornum.toString().toInt() - usedCount.toInt() > 0
         }.sortedBy { it.displayid }
     }
 
@@ -75,6 +76,7 @@
                 if (vo.sguid == scene.guid) {
                     vo.sceneTypeId = scene.typeid?.toInt() ?: 0
                     vo.sceneType = scene.type
+                    vo.scene = scene
                     return@f
                 }
             }

--
Gitblit v1.9.3