From ab96f3e74c68b561a7148c9f02ad99de4f1627a2 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Thu, 30 May 2024 17:14:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A1=E6=A3=80=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/kms/yxgh/df/domain/DfRecord.java    |  5 +++++
 .../java/com/kms/yxgh/df/dto/DfRecordDetailDto.java   | 11 +++++++++++
 .../java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java   |  3 +++
 3 files changed, 19 insertions(+)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecord.java
index 5b2ced33..554fa7ad 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecord.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecord.java
@@ -22,6 +22,7 @@ public class DfRecord extends SyBaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+    private String name;
     @ApiModelProperty("巡查计划ID")
     private String planId;
 
@@ -66,4 +67,8 @@ public class DfRecord extends SyBaseEntity {
 
     @ApiModelProperty("巡查范围")
     private String scope;
+
+    public String getName() {
+        return this.lineName;
+    }
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java
index 5508d70f..22d86532 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java
@@ -1,5 +1,6 @@
 package com.kms.yxgh.df.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kms.yxgh.base.AddGroup;
 import com.kms.yxgh.base.UpdateGroup;
 import io.swagger.annotations.ApiModel;
@@ -36,6 +37,14 @@ public class DfRecordDetailDto {
     @ApiModelProperty("堤防编码")
     private String dikeCode;
 
+    @NotBlank(message = "堤防名称不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @ApiModelProperty("堤防名称")
+    private String dikeName;
+
+    @NotBlank(message = "堤防类型不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @ApiModelProperty("堤防类型")
+    private String dikeType;
+
     @ApiModelProperty("状态")
     private String status;
 
@@ -65,10 +74,12 @@ public class DfRecordDetailDto {
     private String dutyHolderType;
 
     @NotNull(message = "巡查开始时间不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("巡查开始时间")
     private Date startDate;
 
     @NotNull(message = "巡查结束时间不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("巡查结束时间")
     private Date endDate;
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java
index 9d0e86f8..510d1da9 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java
@@ -1,5 +1,6 @@
 package com.kms.yxgh.df.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -53,9 +54,11 @@ public class DfRecordSimpleDto {
     @ApiModelProperty("巡查责任人类型")
     private String dutyHolderType;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("记录开始时间")
     private Date startDate;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("记录结束时间")
     private Date endDate;