From a5cdbf569067822e3232d2177b8a9aac1ed95b69 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 29 五月 2024 17:32:00 +0800
Subject: [PATCH] 1. 修改自评逻辑中,问题整改的判断方式为已整改并且整改审核通过; 2. 新增评估详情获取接口;

---
 src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/ProblemlistMapper.kt |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/ProblemlistMapper.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/ProblemlistMapper.kt
index 9aee3a8..b0759ad 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/ProblemlistMapper.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/ProblemlistMapper.kt
@@ -2,22 +2,29 @@
 
 import cn.flightfeather.supervision.domain.ds1.entity.Problemlist
 import cn.flightfeather.supervision.domain.util.MyMapper
+import cn.flightfeather.supervision.lightshare.vo.SceneProblemSummary
+import cn.flightfeather.supervision.lightshare.vo.StatisticsVo
 import cn.flightfeather.supervision.lightshare.vo.UnChangedPro
 import org.apache.ibatis.annotations.Mapper
 import kotlin.reflect.jvm.internal.impl.load.kotlin.JvmType
 
 @Mapper
-interface ProblemlistMapper:MyMapper<Problemlist> {
+interface ProblemlistMapper : MyMapper<Problemlist> {
 
     /**
      * 鑾峰彇鏌愭椂闂存鍐呫�佹煇涓尯鍘跨殑鏌愮鍦烘櫙涓嬶紝鍚勭被鍨嬬殑闂鏁伴噺缁熻
-     * @param districtcode 鍖哄幙琛屾斂缂栫爜
-     * @param starttime 寮�濮嬫椂闂�
-     * @param endtime 缁撴潫鏃堕棿
+     * @param districtCode 鍖哄幙琛屾斂缂栫爜
+     * @param startTime 寮�濮嬫椂闂�
+     * @param endTime 缁撴潫鏃堕棿
      * @param sceneType 鍦烘櫙绫诲瀷
      */
-    fun getStatisticalResult(districtcode:String?, starttime:String?, endtime:String?, sceneType:String?): List<Map<String, JvmType.Object>>
-//    fun getStatisticalResult(): List<Map<String, JvmType.Object>>
+    fun getStatisticalResult(
+        districtCode: String?,
+        startTime: String?,
+        endTime: String?,
+        sceneType: String?,
+        sceneId: String?,
+    ): List<StatisticsVo>
 
     fun getStatisticalResultById(topTaskId: String?, sceneTypeId: String?): List<Map<String, JvmType.Object>>
 
@@ -26,9 +33,9 @@
      * @param topTaskId 椤跺眰浠诲姟涓婚敭id
      * @param sceneType 鍦烘櫙绫诲瀷id
      */
-    fun getChangeResult(topTaskId:String?, sceneType:String?): List<Map<String, JvmType.Object>>
+    fun getChangeResult(topTaskId: String?, sceneType: String?): List<Map<String, JvmType.Object>>
 
-    fun getScoreResult(topTaskId:String?, sceneType:String?): List<Map<String, JvmType.Object>>
+    fun getScoreResult(topTaskId: String?, sceneType: String?): List<Map<String, JvmType.Object>>
 
     fun selectSE(sql: String): String
 
@@ -39,7 +46,7 @@
     /**
      * 閫氳繃ID鏌ユ壘 鏈堥棶棰樺垪琛�
      */
-    fun findMonthProblemById(taskId: String,sceneType: Int?): List<Map<String, JvmType.Object?>>
+    fun findMonthProblemById(taskId: String, sceneType: Int?): List<Map<String, JvmType.Object?>>
 
     /**
      * 閫氳繃鏃ヤ换鍔d鏌ユ壘鏈暣鏀瑰畬鎴愮殑瀛愪换鍔℃暟,杩斿洖鐨勬槸姣忎釜瀛愪换鍔℃湭瀹屾垚鏁存敼鐨勯棶棰樻暟
@@ -50,4 +57,14 @@
      * 鏌ユ壘闂鐢熸垚鏃堕棿鍦ㄧ粰瀹氭椂闂翠箣鍓嶇殑鎵�鏈夐棶棰�
      */
     fun getUnChangedProblem(deadLine: String): List<UnChangedPro>
+
+    /**
+     * 鑾峰彇鎬讳换鍔�
+     */
+    fun getSceneProSummary(
+        topTaskId: String,
+        sceneTypeId: String?,
+        sort: String?,
+        sortBy: String,
+    ): List<SceneProblemSummary>
 }
\ No newline at end of file

--
Gitblit v1.9.3