From f17a6dbf2290f73ced65e03121d0998d1416c959 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 26 Dec 2023 16:01:58 +0800
Subject: [PATCH] bug修复

---
 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
index c8e75b6..3123b2e 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -12,9 +12,15 @@
 
     <!--自定义分页查询-->
     <select id="selectPlaceExtPage" resultType="org.springblade.modules.place.vo.PlaceExtVO">
-        select jpe.*,jp.place_name as placeName from jczz_place_ext jpe
-        left join jczz_place jp on jpe.place_id = jp.id and jp.is_deleted = 0
-        where jpe.is_deleted = 0
+        SELECT
+        jpe.*,
+        jp.place_name AS placeName
+        FROM
+        jczz_place_ext jpe
+        LEFT JOIN jczz_place jp ON jpe.place_id = jp.id
+        AND jp.is_deleted = 0
+        WHERE
+        jpe.is_deleted = 0
         <if test="placeExt.placeName != null and placeExt.placeName != ''">
             and jp.place_name like concat('%',#{placeExt.placeName},'%')
         </if>
@@ -24,6 +30,9 @@
         <if test="placeExt.confirmFlag != null">
             and jpe.confirm_flag = #{placeExt.confirmFlag}
         </if>
+        <if test="placeExt.startTime != null and placeExt.startTime != '' and placeExt.endTime != null and placeExt.endTime != '' ">
+            AND jpe.create_time BETWEEN #{placeExt.startTime} and #{placeExt.endTime}
+        </if>
         <if test="placeExt.roleName!=null and placeExt.roleName!='' and placeExt.createUser!=null">
             <choose>
                 <when test="placeExt.roleName=='网格员'">
@@ -32,7 +41,7 @@
                     jp.create_user = #{placeExt.createUser}
                     <if test="houseCodeList != null and houseCodeList.size()>0">
                         or jp.house_code in
-                        <foreach collection="houseCodeList" item="houseCode" separator ="," open="("  close=")">
+                        <foreach collection="houseCodeList" item="houseCode" separator="," open="(" close=")">
                             #{houseCode}
                         </foreach>
                     </if>

--
Gitblit v1.9.3