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/domain/ds1/repository/EvaluationRep.kt | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRep.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRep.kt
index 0d7eb94..daa3233 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRep.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/EvaluationRep.kt
@@ -1,6 +1,8 @@
package cn.flightfeather.supervision.domain.ds1.repository
+import cn.flightfeather.supervision.common.exception.BizException
import cn.flightfeather.supervision.domain.ds1.entity.Evaluation
+import cn.flightfeather.supervision.domain.ds1.entity.Itemevaluation
import cn.flightfeather.supervision.domain.ds1.mapper.EvaluationMapper
import cn.flightfeather.supervision.domain.ds1.mapper.ItemevaluationMapper
import cn.flightfeather.supervision.lightshare.vo.AreaVo
@@ -22,15 +24,24 @@
* @param date 鏃ユ湡锛屽彧浣跨敤骞村拰鏈�
* @return
*/
- fun findByScene(sceneId: String?, date: LocalDate): Evaluation? {
+ fun findByScene(sceneId: String?, date: LocalDate): List<Evaluation?> {
val sT = date.withDayOfMonth(1).atStartOfDay()
val eT = sT.plusMonths(1).minusSeconds(1)
val res = evaluationMapper.selectByExample(Example(Evaluation::class.java).apply {
createCriteria().andEqualTo("sguid", sceneId)
.andBetween("evaluatetime", sT, eT)
})
- return if (res.isNotEmpty()) res[0] else null
+ return res
}
+
+ fun findBySubtask(subTaskId: String?): Evaluation? {
+ try {
+ return evaluationMapper.selectOne(Evaluation().apply { stguid = subTaskId })
+ } catch (e: Exception) {
+ throw BizException("宸℃煡[${subTaskId}]瀵瑰簲浜嗗鏉¤瘎浼版�诲垎璁板綍锛岃妫�鏌ユ槸鍚︽湁绯荤粺閫昏緫閿欒")
+ }
+ }
+
/**
* 鏌ユ壘鑷姩璇勫垎缁撴灉
@@ -40,4 +51,13 @@
val task = taskRep.findOneTask(areaVo) ?: return null
return evaluationMapper.findEvaluation(task.tguid!!, areaVo.scensetypeid!!)
}
+
+ /**
+ * 鏌ユ壘宸℃煡浠诲姟鐨勫叿浣撹瘎鍒�
+ */
+ fun findItemEvaluation(subTaskId: String): List<Itemevaluation> {
+ return itemevaluationMapper.selectByExample(Example(Itemevaluation::class.java).apply {
+ createCriteria().andEqualTo("stguid", subTaskId)
+ })
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3