From cfed607d085002b737ff54992ebd469954362ab3 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 26 一月 2023 01:19:02 +0800
Subject: [PATCH] 加入业主入驻申请功能

---
 java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
index 76064b8..8e7847e 100755
--- a/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
@@ -132,10 +132,11 @@
         createTime,t.community_id communityId,bow.name ownerName,bow.id_card idCard,bow.link,t2.name stateName,
         t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.state,
         t.car_type_cd,t.car_type_cd carTypeCd,t.member_id,t.member_id memberId,ps.num,pa.num areaNum,t.lease_type leaseType,
-        t3.name leaseTypeName
+        t3.name leaseTypeName,t4.name carTypeCdName
         from owner_car t
         left join t_dict t1 on t.car_type=t1.status_cd and t1.table_name='owner_car' and t1.table_columns = 'car_type'
         left join t_dict t2 on t.state=t2.status_cd and t2.table_name='owner_car' and t2.table_columns = 'state'
+        left join t_dict t4 on t.car_type_cd=t4.status_cd and t4.table_name='owner_car' and t4.table_columns = 'car_type_cd'
         left join building_owner bow on t.owner_id = bow.member_id and bow.status_cd = '0' and bow.community_id =
         t.community_id
         left join parking_space ps on t.ps_id = ps.ps_id and ps.status_cd = '0'
@@ -160,6 +161,12 @@
         <if test="carTypeCds !=null">
             and t.car_type_cd in
             <foreach collection="carTypeCds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="paIds !=null">
+            and pa.pa_id in
+            <foreach collection="paIds" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
@@ -198,6 +205,9 @@
         </if>
         <if test="ownerName !=null and ownerName != ''">
             and bow.name like '%${ownerName}%'
+        </if>
+        <if test="link !=null and link != ''">
+            and bow.link = #{link}
         </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
@@ -362,6 +372,9 @@
         <if test="ownerName !=null and ownerName != ''">
             and bow.name like '%${ownerName}%'
         </if>
+        <if test="link !=null and link != ''">
+            and bow.link = #{link}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>

--
Gitblit v1.8.0