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/service/impl/InspectionServiceImpl.kt | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/InspectionServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/InspectionServiceImpl.kt
index 2240ac3..9b3a7c3 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/InspectionServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/InspectionServiceImpl.kt
@@ -34,8 +34,6 @@
@Autowired
lateinit var subtaskService: SubtaskService
- private val dateUtil = DateUtil()
-
//鑾峰彇姹℃煋鍦烘櫙鐗堟湰涓婚〉鐨勭洃绠℃儏鍐靛睍绀哄唴瀹�
override fun getInspectionInfoByScene(sceneId: String, topTaskId: String): InspectionInfoVo? {
val resList = inspectionMapper.getInspectionInfoByScene(sceneId, topTaskId)
@@ -43,9 +41,9 @@
}
//鏍规嵁宸℃煡ID鑾峰彇闂鍒楄〃
- override fun findProblemListById(id: String): MutableList<ProblemlistVo> {
+ override fun findProblemListById(id: String): MutableList<ProblemListVo> {
- val problemList = mutableListOf<ProblemlistVo>()
+ val problemList = mutableListOf<ProblemListVo>()
val inspection = inspectionMapper.selectByPrimaryKey(id)
if (inspection != null) {
val problemListVo = problemlistService.findByInspectionID(inspection.guid!!)
@@ -78,7 +76,7 @@
val example = Example(Inspection::class.java)
val criteria = example.createCriteria()
criteria.andEqualTo("sguid", id)
- criteria.andLessThan("executionstarttime", DateUtil().StringToDate(date))
+ criteria.andLessThan("executionstarttime", DateUtil.StringToDate(date))
//娣诲姞宸℃煡鎸夋墽琛屾椂闂存帓搴�*****
example.orderBy("executionstarttime").desc()
//**************************
--
Gitblit v1.9.3