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/EvaluationServiceImpl.kt | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationServiceImpl.kt
index 346b362..278aa8c 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationServiceImpl.kt
@@ -27,6 +27,7 @@
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.beans.factory.annotation.Value
import org.springframework.stereotype.Service
+import org.springframework.web.multipart.MultipartFile
import tk.mybatis.mapper.entity.Example
import java.io.File
import java.util.*
@@ -39,7 +40,6 @@
private val evaluationRep: EvaluationRep,
private val taskRep: TaskRep,
private val aopTaskCtrl: AopTaskCtrl,
- private val searchService: SearchService,
private val dbMapper: DbMapper,
@Value("\${filePath}") private val filePath: String,
private val reportTaskCtrl: ReportTaskCtrl,
@@ -284,7 +284,13 @@
//1. 鏌ユ壘鍘嗗彶璁板綍锛屾煡鐪嬭瘎浼版槸鍚﹀凡瀛樺湪
// areaVo.scensetypeid ?: throw ResponseErrorException("鏌ヨ鏃跺繀椤婚�夋嫨涓�涓満鏅被鍨�")
// val task = taskRep.findOneTask(areaVo) ?: throw ResponseErrorException("鏌ヨ鏃跺繀椤婚�夋嫨涓�涓満鏅被鍨�")
- return evaluationRep.findAutoScore(areaVo)
+ val evaList = evaluationRep.findAutoScore(areaVo)
+ evaList?.forEach {
+ it?.subTaskId?.let { id->
+ it.itemEvaluations = evaluationRep.findItemEvaluation(id)
+ }
+ }
+ return evaList
}
override fun downloadAutoEvaluation(areaVo: AreaVo, forceUpdate: Boolean, response: HttpServletResponse): Boolean {
@@ -326,4 +332,12 @@
return true
}
}
+
+ override fun downloadAutoEvaTemplate(areaVo: AreaVo, response: HttpServletResponse) {
+ TODO("Not yet implemented")
+ }
+
+ override fun uploadAutoEvaluation(areaVo: AreaVo, file: MultipartFile): Boolean {
+ TODO("Not yet implemented")
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3