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/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