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/lightshare/vo/DeviceMapVo.kt | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DeviceMapVo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DeviceMapVo.kt
index 8d8c370..888981f 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DeviceMapVo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DeviceMapVo.kt
@@ -37,6 +37,7 @@
svUserName = it.svUserName
tzUserId = it.tzUserId
tzUserName = it.tzUserName
+ createTime = it.createTime
})
}
return res
@@ -53,6 +54,7 @@
svUserName = it.svUserName
tzUserId = it.tzUserId
tzUserName = it.tzUserName
+ createTime = it.createTime
})
}
return res
@@ -69,9 +71,35 @@
svUserName = it.svUserName
tzUserId = it.tzUserId
tzUserName = it.tzUserName
+ createTime = it.createTime
})
}
return res
}
}
+}
+
+/**
+ * 鏍规嵁璁惧mn缂栫爜鎵惧埌瀵瑰簲鍏崇郴
+ */
+fun List<DeviceMapVo>.findByDeviceCode(code: String?): DeviceMapVo? {
+ this.forEach {
+ if (it.deviceCode == code) {
+ return it
+ }
+ }
+ return null
+}
+
+/**
+ * 鏍规嵁椋炵窘鐩戠绯荤粺鐢ㄦ埛id鎵惧埌瀵瑰簲鍏崇郴
+ */
+fun List<DeviceMapVo>.findBySVUserId(svUserId: String?): List<DeviceMapVo> {
+ val res = mutableListOf<DeviceMapVo>()
+ this.forEach {
+ if (it.svUserId == svUserId) {
+ res.add(it)
+ }
+ }
+ return res
}
\ No newline at end of file
--
Gitblit v1.9.3