From 1a45c6fe9ea814e432cf90c0169be9b7d991a266 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 10 十二月 2024 13:51:00 +0800
Subject: [PATCH] 1. 新增 BaseExcel.kt 和 BaseTemplate.kt 的 toObject输出到对象方法 2. 新增 BaseTemplate 是否执行的状态属性 3. 在cn.flightfeather.supervision.business.report.bean包下新增 BaseTemplateResult.kt 结果对象抽象类 以及 ProAnalysisSummaryResult.kt 和 ProDetailSummaryResult.kt 对应实现：问题整改动态跟踪和分街镇问题整改分析的中间结果对象 注：除了问题整改动态跟踪和分街镇问题整改分析其他的汇总表对象中都没有对应中间结果对象，因此这里还有报错信息
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 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 348eedc..104ab39 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AreaVo.kt
@@ -1,34 +1,67 @@
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)
-open class AreaVo{
- // 琛屾斂鍖哄垝
+@ApiModel("鍖哄煙鏉′欢")
+open class AreaVo {
+ @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
- var endtime: String? = null
+ @ApiModelProperty("璧峰鏃堕棿锛屾牸寮� yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ var starttime: LocalDateTime? = 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
- // 鏄惁涓婄嚎
+ @ApiModelProperty("鏄惁涓婄嚎")
var online: Boolean? = null
- // 涓绘暟鎹簮锛�1锛氫互椋炵窘鐜绯荤粺涓殑鐢ㄦ埛涓轰富浣擄紱2锛氫互椋炵窘鐩戠绯荤粺涓殑鐢ㄦ埛涓轰富浣�
- var sourceType:Int = 1
+ @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