From f8b73566a4a7adf121913023ffda0ecc0031fc6a Mon Sep 17 00:00:00 2001
From: peihao <1280253838@qq.com>
Date: Fri, 9 Jul 2021 18:03:45 +0800
Subject: [PATCH] =?UTF-8?q?1.0.0=20=E6=96=B0=E5=A2=9E=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/air/applets/vo/LandVo.java  |  4 ++--
 .../service/impl/LandListedServiceImpl.java   |  2 ++
 .../resources/mapper/LandListedMapper.xml     | 20 +++++++++----------
 .../resources/mapper/LandToListMapper.xml     |  4 ++--
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/air/src/main/java/com/air/applets/vo/LandVo.java b/air/src/main/java/com/air/applets/vo/LandVo.java
index c724ad8..2f10646 100644
--- a/air/src/main/java/com/air/applets/vo/LandVo.java
+++ b/air/src/main/java/com/air/applets/vo/LandVo.java
@@ -19,10 +19,10 @@ import java.time.LocalDate;
 public class LandVo {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "成交开始时间")
+    @ApiModelProperty(value = "成交开始时间（格式yyyy-MM-dd）")
     private String startDate;
 
-    @NotBlank(message = "成交结束时间")
+    @NotBlank(message = "成交结束时间（格式yyyy-MM-dd）")
     private String endDate;
 
     @NotBlank(message = "交易状态")
diff --git a/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java
index 886e0b7..3c03279 100644
--- a/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java
+++ b/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java
@@ -26,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -83,6 +84,7 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
 
     @Override
     public List<LandDto> appletsLandListed(Page page, LandVo landVo) {
+        landVo.setNowDate(cn.hutool.core.date.DateUtil.formatDate(new Date()));
         return baseMapper.appletsLandListed(page,landVo);
     }
 
diff --git a/air/src/main/resources/mapper/LandListedMapper.xml b/air/src/main/resources/mapper/LandListedMapper.xml
index e1c7930..a87803a 100644
--- a/air/src/main/resources/mapper/LandListedMapper.xml
+++ b/air/src/main/resources/mapper/LandListedMapper.xml
@@ -89,26 +89,26 @@
                 and md.measure_data_id IS not NULL
             </if>
             <if test='"listed" == landVo.transactionStatus'>
-                and date_format(ll.auction_date,'%Y-%m-%d') > #{nowDate}
+                and date_format(ll.auction_date,'%Y-%m-%d') > #{landVo.nowDate}
             </if>
             <if test='"passBy" == landVo.transactionStatus'>
-                and date_format(ll.auction_date,'%Y-%m-%d') &lt; #{nowDate}
+                and date_format(ll.auction_date,'%Y-%m-%d') &lt; #{landVo.nowDate}
                 and ll.deal = 0
             </if>
             <if test='"dealDone" == landVo.transactionStatus'>
                 and ll.deal = 1
             </if>
-            <if test="landVo.startDate != null and landVo.startDate != ''">
-                and date_format(ll.auction_date,'%Y-%m-%d') >= #{startDate}
-            </if>
-            <if test="landVo.endDate != null and landVo.endDate != ''">
-                and date_format(ll.auction_date,'%Y-%m-%d') &lt;= #{endDate}
-            </if>
             <if test="landVo.city != null and landVo.city != ''">
-                and ll.city = #{city}
+                and ll.city = #{landVo.city}
             </if>
             <if test="landVo.canton != null and landVo.canton != ''">
-                and ll.canton = #{canton}
+                and ll.canton = #{landVo.canton}
+            </if>
+            <if test="landVo.startDate != null and landVo.startDate != ''">
+                and date_format(ll.auction_date,'%Y-%m-%d') >= #{landVo.startDate}
+            </if>
+            <if test="landVo.endDate != null and landVo.endDate != ''">
+                and date_format(ll.auction_date,'%Y-%m-%d') &lt;= #{landVo.endDate}
             </if>
         </where>
 
diff --git a/air/src/main/resources/mapper/LandToListMapper.xml b/air/src/main/resources/mapper/LandToListMapper.xml
index c09961e..3628b6e 100644
--- a/air/src/main/resources/mapper/LandToListMapper.xml
+++ b/air/src/main/resources/mapper/LandToListMapper.xml
@@ -19,10 +19,10 @@
                 and md.measure_data_id IS not NULL
             </if>
             <if test="landVo.city != null and landVo.city != ''">
-                and ll.city = #{city}
+                and ll.city = #{landVo.city}
             </if>
             <if test="landVo.canton != null and landVo.canton != ''">
-                and ll.canton = #{canton}
+                and ll.canton = #{landVo.canton}
             </if>
         </where>