From a3cc1d220f8a1de11874bebceba0130d32157ff1 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 30 九月 2025 09:26:32 +0800
Subject: [PATCH] 2025.9.30 1. 联合前端调试数据产品接口(待完成)
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/EvaluationServiceImpl.kt | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 e0a0cf8..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,
@@ -218,7 +218,7 @@
val example = Example(Subtask::class.java)
val criteria = example.createCriteria()
criteria.andEqualTo("districtcode", districtCode)
- val date = DateUtil().StringToDate(time)
+ val date = DateUtil.StringToDate(time)
criteria.andGreaterThanOrEqualTo("planstarttime", time)
val subTaskList = subtaskMapper.selectByExample(example)
subTaskList.forEach {
@@ -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