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/domain/ds2/repository/UserMapRep.kt | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/UserMapRep.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/UserMapRep.kt
index 1ed3e11..c47165b 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/UserMapRep.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds2/repository/UserMapRep.kt
@@ -8,6 +8,7 @@
import cn.flightfeather.supervision.domain.ds2.mapper.UserMapMapper
import org.springframework.stereotype.Repository
import tk.mybatis.mapper.entity.Example
+import java.util.*
@Repository
class UserMapRep(
@@ -22,15 +23,15 @@
* @return
*/
fun findFromSupervision(userinfoTZ: UserinfoTZ?): Scense? {
+ return findFromSupervision(userinfoTZ?.guid)
+ }
+
+ fun findFromSupervision(guid: String?): Scense? {
val userMap = UserMap().apply {
- tzUserId = userinfoTZ?.guid
+ tzUserId = guid
}
// 鎵惧埌涓や釜绯荤粺鐢ㄦ埛鐨勫搴斿叧绯�
- val uMap = userMapMapper.selectOne(userMap)
- if (uMap == null) {
- println("${userinfoTZ?.guid}, ${userinfoTZ?.realname}")
- return null
- }
+ val uMap = userMapMapper.selectOne(userMap) ?: return null
// 鎵惧埌椋炵窘鐩戠涓殑鐢ㄦ埛淇℃伅
val userInfoSp = userinfoMapper.selectByPrimaryKey(uMap.svUserId)
// 鎵惧埌椋炵窘鐩戠涓殑鍦烘櫙淇℃伅
@@ -45,4 +46,9 @@
createCriteria().andIn("svUserId", idList)
})
}
+
+ fun insert(userMap: UserMap): Int {
+ if (userMap.umCreateTime == null) userMap.umCreateTime = Date()
+ return userMapMapper.insert(userMap)
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3