From 274bc2d0f7fe8fe7525196e4d7d6ece1cafe2c6c Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期日, 04 二月 2024 17:32:14 +0800
Subject: [PATCH] 1. 新增静安50分制评估结果转换逻辑； 2. 新增根据坐标圆心和半径查询范围内场景逻辑；
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/InspectionServiceImpl.kt | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 6586836..37be34c 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
@@ -29,6 +29,8 @@
@Autowired
lateinit var subtaskService: SubtaskService
+ private val dateUtil = DateUtil()
+
//鑾峰彇姹℃煋鍦烘櫙鐗堟湰涓婚〉鐨勭洃绠℃儏鍐靛睍绀哄唴瀹�
override fun getInspectionInfoByScene(sceneId: String, topTaskId: String): InspectionInfoVo {
val maps = inspectionMapper.getInspectionInfoByScene(sceneId, topTaskId)
@@ -43,9 +45,10 @@
inspectionInfoVo.inspectionId = map["inspectionId"].toString()
inspectionInfoVo.subtaskId = map["subtaskId"].toString()
inspectionInfoVo.inspected = map["isInspected"].toString().equals("1")
- inspectionInfoVo.inspectionTime = map["inspectionTime"].toString()
- val time = inspectionInfoVo.inspectionTime
- inspectionInfoVo.inspectionTime = time?.substring(0, time.length-11)
+ map["inspectionTime"]?.let {
+ val time = it.toString()
+ inspectionInfoVo.inspectionTime = dateUtil.StringToString(time, DateUtil.DateStyle.YYYY_MM_DD)
+ }
inspectionInfoVo.inspectionTimes = map["inspectionTimes"].toString().toInt()
inspectionInfoVo.promised = map["isPromised"].toString().equals("1")
inspectionInfoVo.changed = map["isChanged"].toString().equals("1")
@@ -182,12 +185,12 @@
}
//鏍规嵁瀛愪换鍔d鑾峰彇鍗曢」鑰冩牳璇勪及
- val itemevaluation = itemevaluationService.findBySubTaskID(subTaskID)
- if (!itemevaluation.isEmpty()) {
- inspectionVo.itemevaluationList = itemevaluation
- } else {
- inspectionVo.itemevaluationList = mutableListOf()
- }
+// val itemevaluation = itemevaluationService.findBySubTaskID(subTaskID)
+// if (!itemevaluation.isEmpty()) {
+// inspectionVo.itemevaluationList = itemevaluation
+// } else {
+// inspectionVo.itemevaluationList = mutableListOf()
+// }
//杩斿洖
return inspectionVo
--
Gitblit v1.9.3