From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复

---
 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 48 insertions(+), 1 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 2dd3b8c..9b1b450 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -2,9 +2,56 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.modules.place.mapper.PlaceExtMapper">
 
+    <resultMap id="detailMap" type="org.springblade.modules.place.vo.PlaceExtVO" autoMapping="true">
+        <id property="id" column="id"/>
+        <collection property="placePractitioner" javaType="java.util.List"
+                    ofType="org.springblade.modules.place.vo.PlacePractitionerVO" autoMapping="true">
+            <id property="id" column="cid"/>
+        </collection>
+    </resultMap>
+
     <!--自定义分页查询-->
     <select id="selectPlaceExtPage" resultType="org.springblade.modules.place.vo.PlaceExtVO">
-        select * from jczz_place_ext where 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>
+        <if test="placeExt.houseCode != null and placeExt.houseCode != ''">
+            and jp.house_code = #{placeExt.houseCode}
+        </if>
+        <if test="placeExt.confirmFlag != null">
+            and jpe.confirm_flag = #{placeExt.confirmFlag}
+        </if>
+        <if test="placeExt.roleName!=null and placeExt.roleName!='' and placeExt.createUser!=null">
+            <choose>
+                <when test="placeExt.roleName=='网格员'">
+                    and
+                    (
+                    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=")">
+                            #{houseCode}
+                        </foreach>
+                    </if>
+                    )
+                </when>
+                <otherwise>
+                    and jp.principal_user_id = #{placeExt.createUser}
+                </otherwise>
+            </choose>
+        </if>
+        order by jpe.create_time desc,jpe.id desc
+    </select>
+
+    <!--自定义详情查询-->
+    <select id="getDetail" 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
+        and jpe.place_id = #{placeExt.placeId}
     </select>
 
 

--
Gitblit v1.9.3