From 22555e39d2fbfc875588ae23186bc9b11ca59860 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Mon, 30 Dec 2024 11:34:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/entity/Detail.java | 2 +-
 src/main/java/com/example/demo/mapper/DetailYMapper.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/entity/Detail.java b/src/main/java/com/example/demo/domain/entity/Detail.java
index fa98085..91762a7 100644
--- a/src/main/java/com/example/demo/domain/entity/Detail.java
+++ b/src/main/java/com/example/demo/domain/entity/Detail.java
@@ -38,7 +38,7 @@ public class Detail implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
-
+    private String username;
     private Date endDate;
     private Date startDate;
     private String uname;
diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java
index 36d16b4..8e1f642 100644
--- a/src/main/java/com/example/demo/mapper/DetailYMapper.java
+++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java
@@ -84,8 +84,9 @@ public interface DetailYMapper {
             "`detail_y`",
             "<where>",
             "<if test='jwcode!=null and jwcode.length>0'>AND jwcode=#{jwcode}</if>",
-            "<if test='updateType!=null'>AND update_type=#{updateType}</if>",
-            "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
+//            "<if test='updateType!=null'>AND update_type=#{updateType}</if>",
+//            "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
+            "<if test='area!=null and area.length>0'>AND area=#{area}</if>",
             "</where>",
             "</script>"
     })