From 00e79777005543dd11732436b8690167451acde7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 29 七月 2021 19:00:59 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java
similarity index 71%
rename from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordDTO.java
rename to springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java
index 644a356..1706212 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,10 +13,11 @@
import java.util.Date;
/**
- * 巡查记录DTO
+ * 分页查询巡查记录DTO
*/
@Data
-public class ComSwPatrolRecordDTO implements Serializable {
+@ApiModel("分页查询巡查记录DTO")
+public class ComSwPatrolRecordPageDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -47,8 +49,8 @@
/**
* (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
*/
- @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)")
- private Integer patrolType;
+ @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查),多条以逗号隔开")
+ private String patrolType;
/**
* 巡查人员
@@ -56,4 +58,16 @@
@ApiModelProperty("巡查人员")
private String patrolPerson;
+ /**
+ * 状态（1.待查看 2.待处理 3.待整改 4.已整改）
+ */
+ @ApiModelProperty("状态（1.待处理 2.待整改 3.已整改）")
+ private String status;
+
+ /**
+ * 查看人（1.全部 2.只看我的）
+ */
+ @ApiModelProperty("查看人（1.全部 2.只看我的）")
+ private Integer selectPerson;
+
}
--
Gitblit v1.7.1