From d6e4131adfb2ad943c5ff18eaa1bc21d0ca873d7 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 25 Mar 2025 13:25:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2=E7=AB=99=E7=82=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/dto/QueryStationDTO.java   | 17 +++++++++--------
 .../mapper/pile/PileStationInfoMapper.xml       | 10 ++++++++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java
index 06ca44166..6451b1907 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java
@@ -127,10 +127,19 @@ public class QueryStationDTO extends BaseEntity {
 
     private String memberId;
 
+    /**
+     * 是否有雨棚
+     */
     private String canopyFlag;
 
+    /**
+     * 是否有道闸
+     */
     private String barrierFlag;
 
+    /**
+     * 是否有地锁
+     */
     private String parkingLockFlag;
 
     @Data
@@ -150,14 +159,6 @@ public class QueryStationDTO extends BaseEntity {
          */
         private List<String> pilePower;
 
-        /**
-         * 站点服务
-         * 1 - 雨棚
-         * 2 - 休息室
-         * 3 - 卫生间
-         */
-        private List<String> stationService;
-
         /**
          * 我的收藏
          */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
index 8589a724f..9c0569a60 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
@@ -370,8 +370,14 @@
         <if test="stationDTO.address != null and stationDTO.address != ''">
             and t1.address like concat('%', #{stationDTO.address,jdbcType=VARCHAR}, '%')
         </if>
-        <if test="stationDTO.stationTel != null and stationDTO.stationTel != ''">
-            and t1.station_tel = #{stationDTO.stationTel,jdbcType=VARCHAR}
+        <if test="stationDTO.canopyFlag != null and stationDTO.canopyFlag != ''">
+            and t1.canopy_flag = #{stationDTO.canopyFlag,jdbcType=VARCHAR}
+        </if>
+        <if test="stationDTO.barrierFlag != null and stationDTO.barrierFlag != ''">
+            and t1.barrier_flag = #{stationDTO.barrierFlag,jdbcType=VARCHAR}
+        </if>
+        <if test="stationDTO.parkingLockFlag != null and stationDTO.parkingLockFlag != ''">
+            and t1.parking_lock_flag = #{stationDTO.parkingLockFlag,jdbcType=VARCHAR}
         </if>
         <!-- 数据范围过滤 -->
         <if test="stationDTO.merchantDeptIds != null and stationDTO.merchantDeptIds.size() != 0">