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/AreaVo.kt |   47 ++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt
index 7e8025e..67dcd86 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt
@@ -1,33 +1,70 @@
 package cn.flightfeather.supervision.lightshare.vo
 
+import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.annotation.JsonInclude
+import io.swagger.annotations.ApiModel
+import io.swagger.annotations.ApiModelProperty
+import java.time.LocalDateTime
 
+/**
+ * 鍖哄煙鏉′欢
+ */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-class AreaVo{
+@ApiModel("鍖哄煙鏉′欢")
+open class AreaVo {
+    @ApiModelProperty("鎬讳换鍔d")
+    var topTaskId: String? = null
 
+    @ApiModelProperty("鐪佷唤缂栫爜")
     var provincecode: String? = null
 
+    @ApiModelProperty("鐪佷唤鍚嶇О")
     var provincename: String? = null
 
+    @ApiModelProperty("鍩庡競缂栫爜")
     var citycode: String? = null
 
+    @ApiModelProperty("鍩庡競鍚嶇О")
     var cityname: String? = null
 
+    @ApiModelProperty("鍖哄幙缂栫爜")
     var districtcode: String? = null
 
+    @ApiModelProperty("鍖哄幙鍚嶇О")
     var districtname: String? = null
 
+    @ApiModelProperty("琛楅晣缂栫爜")
     var towncode: String? = null
 
+    @ApiModelProperty("琛楅晣鍚嶇О")
     var townname: String? = null
 
-    var starttime: String? = null
+    @ApiModelProperty("璧峰鏃堕棿锛屾牸寮� yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    var starttime: LocalDateTime? = null
 
-    var endtime: String? = null
+    @ApiModelProperty("缁撴潫鏃堕棿锛屾牸寮� yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    var endtime: LocalDateTime? = null
 
+    @ApiModelProperty("鍦烘櫙涓婚敭id")
+    var sceneId: String? = null
+
+    @ApiModelProperty("鍦烘櫙鍚嶇О")
+    var sceneName: String? = null
+
+    @ApiModelProperty("鍦烘櫙绫诲瀷id")
     var scensetypeid: String? = null
 
-    var notstandardnum: Int = 0
+    @ApiModelProperty("鏄惁涓婄嚎")
+    var online: Boolean? = null
 
-    var allsensenum: Int = 0
+    @ApiModelProperty("涓绘暟鎹簮", allowableValues = "1锛氫互椋炵窘鐜绯荤粺涓殑鐢ㄦ埛涓轰富浣擄紱2锛氫互椋炵窘鐩戠绯荤粺涓殑鐢ㄦ埛涓轰富浣�")
+    var sourceType: Int = 1
+
+    @ApiModelProperty("鏌ヨ鎺掑簭", allowableValues = "asc锛氭搴�, desc锛氬�掑簭")
+    var sort: String? = "asc"
+
+    @ApiModelProperty("鎺掑簭瀛楁", allowableValues = "pro: 鎸夌収闂鏁版帓搴忥紝changePer锛氭寜鐓ф暣鏀圭巼鎺掑簭")
+    var sortBy: String? = null
 }
\ No newline at end of file

--
Gitblit v1.9.3