From c17e9978745cfe6c983f3aff75c9182fffef32fd Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 09 六月 2025 17:29:23 +0800
Subject: [PATCH] 1. 修复部分数据统计接口bug

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/TaskProgressVo.kt |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/TaskProgressVo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/TaskProgressVo.kt
index b94805a..3892089 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/TaskProgressVo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/TaskProgressVo.kt
@@ -2,22 +2,40 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude
 
+/**
+ * 浠诲姟瀹屾垚鎯呭喌缁熻
+ */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-class TaskProgressVo{
-
+class TaskProgressVo {
+    // 浠诲姟id
     var tguid: String? = null
 
+    // 浠诲姟鍚嶇О
     var name: String? = null
 
+    // 浠诲姟绛夌骇(2:鎬讳换鍔★紱null锛氭棩浠诲姟鎴栧瓙浠诲姟)
     var levelnum: Int? = null
 
-    var totaltask:Int? = null
+    var provinceCode: String? = null
+    var provinceName: String? = null
+    var cityCode: String? = null
+    var cityName: String? = null
+    var districtCode: String? = null
+    var districtName: String? = null
+    var townCode: String? = null
+    var townName: String? = null
 
-    var completetask:Int? = null
+    var totaltask: Int? = null
+    var totaltaskByScene: MutableMap<String?, Int>? = null
 
-    var mytotaltask:Int? = null
+    var completetask: Int? = null
+    var completetaskByScene: MutableMap<String?, Int>? = null
 
-    var mycompletetask:Int? = null
+    var mytotaltask: Int? = null
 
-    var subtaskprogressVo = mutableListOf<TaskProgressVo>()
+    var mycompletetask: Int? = null
+
+    var subtaskprogressVo: List<TaskProgressVo>? = null
+
+    var subTaskSummary: List<SubTaskSummary>? = null
 }
\ No newline at end of file

--
Gitblit v1.9.3