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/vo/TaskProgressVo.kt | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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..78071e6 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/TaskProgressVo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/TaskProgressVo.kt
@@ -2,14 +2,26 @@
import com.fasterxml.jackson.annotation.JsonInclude
+/**
+ * 浠诲姟瀹屾垚鎯呭喌缁熻
+ */
@JsonInclude(JsonInclude.Include.NON_NULL)
class TaskProgressVo{
-
+ // 浠诲姟id
var tguid: String? = null
-
+ // 浠诲姟鍚嶇О
var name: String? = null
-
+ // 浠诲姟绛夌骇(2:鎬讳换鍔★紱null锛氭棩浠诲姟鎴栧瓙浠诲姟)
var levelnum: 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 totaltask:Int? = null
@@ -19,5 +31,7 @@
var mycompletetask:Int? = null
- var subtaskprogressVo = mutableListOf<TaskProgressVo>()
+ var subtaskprogressVo: List<TaskProgressVo>? = null
+
+ var subTaskSummary: List<SubTaskSummary>? = null
}
\ No newline at end of file
--
Gitblit v1.9.3