From 7f0d69033fedc1c9ab312e9cec545f7aedd95eee Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Sat, 2 Mar 2024 14:26:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B0=B4=E9=97=B8=E5=85=BB=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4/=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kms/yxgh/sz/dto/SzYhPlanSearchDto.java    | 103 ++++++++++--------
 .../kms/yxgh/sz/mapper/SzYhPlanMapper.java    |   3 +-
 2 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java
index 247e67c1..f9a2d904 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java
@@ -18,54 +18,61 @@ import java.util.Date;
 @ApiModel("水闸维修养护计划检索")
 public class SzYhPlanSearchDto {
 
-  @ApiModelProperty("养护计划id")
-  private String id;
-
-  /**
-   * 水闸代码
-   */
-  @ApiModelProperty("水闸代码")
-  private String wagaCode;
-
-  @ApiModelProperty("水闸名称")
-  private String wagaName;
-
-  /**
-   * 名称
-   */
-  @ApiModelProperty("名称")
-  private String name;
-
-  /**
-   * 计划时间
-   */
-  @JsonFormat(pattern = "yyyy-MM-dd")
-  @ApiModelProperty("计划时间")
-  private Date planTime;
-
-  /**
-   * 国补资金
-   */
-  @ApiModelProperty("国补资金")
-  private Long nationalSupplement;
-
-  /**
-   * 自筹资金
-   */
-  @ApiModelProperty("自筹资金")
-  private Long selfSupplement;
-
-  /**
-   * 具体地点
-   */
-  @ApiModelProperty("具体地点")
-  private String location;
-
-  /**
-   * 维修养护内容
-   */
-  @ApiModelProperty("维修养护内容")
-  private String content;
+    @ApiModelProperty("养护计划id")
+    private String id;
 
+    /**
+     * 水闸代码
+     */
+    @ApiModelProperty("水闸代码")
+    private String wagaCode;
+
+    @ApiModelProperty("水闸名称")
+    private String wagaName;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty("名称")
+    private String name;
+
+    /**
+     * 计划时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("计划时间")
+    private Date planTime;
+
+    /**
+     * 国补资金
+     */
+    @ApiModelProperty("国补资金")
+    private Long nationalSupplement;
+
+    /**
+     * 自筹资金
+     */
+    @ApiModelProperty("自筹资金")
+    private Long selfSupplement;
+
+    /**
+     * 具体地点
+     */
+    @ApiModelProperty("具体地点")
+    private String location;
+
+    /**
+     * 维修养护内容
+     */
+    @ApiModelProperty("维修养护内容")
+    private String content;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("最近修改时间")
+    private Date updateTime;
 
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java
index 600ab1c4..c9e0c5e6 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java
@@ -30,7 +30,8 @@ public interface SzYhPlanMapper extends BaseMapper<SzYhPlan> {
         public String selectPage(final Map<String, Object> param) {
             return new SQL() {{
                 SELECT("p.id, p.waga_code, j.waga_name as wagaName, p.name, p.plan_time, " +
-                        "p.national_supplement, p.self_supplement, p.location, p.content, j.waga_name");
+                        "p.national_supplement, p.self_supplement, p.location, p.content, j.waga_name" +
+                        "p.create_time, p.update_time"); // 添加了 p.create_time 和 p.update_time
                 FROM("bs_sgc_sz_yhjh p");
                 LEFT_OUTER_JOIN("bs_sgc_sz_jbxx j ON p.waga_code = j.waga_code");
                 WHERE("1=1");