From 372ac7412cc0b02bbd08730bbb4152f3af32a9d2 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 26 一月 2023 02:11:30 +0800
Subject: [PATCH] 优化代码

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

diff --git a/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
index e028571..8e7847e 100755
--- a/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
@@ -21,7 +21,7 @@
         carType,t.operate,t.car_num,t.car_num carNum,t.ps_id,t.ps_id psId,t.remark,t.owner_id,t.owner_id
         ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.car_id,t.car_id carId,t.community_id,t.community_id
         communityId,t.start_time,t.end_time,t.state,t.start_time startTime,t.end_time endTime,t.car_type_cd,
-        t.car_type_cd carTypeCd,t.member_id,t.member_id memberId
+        t.car_type_cd carTypeCd,t.member_id,t.member_id memberId,t.lease_type leaseType
         from business_owner_car t
         where 1 =1
         <if test="carColor !=null and carColor != ''">
@@ -50,6 +50,9 @@
         </if>
         <if test="ownerId !=null and ownerId != ''">
             and t.owner_id= #{ownerId}
+        </if>
+        <if test="leaseType !=null and leaseType != ''">
+            and t.lease_type= #{leaseType}
         </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
@@ -128,14 +131,17 @@
         t.owner_id ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.car_id,t.car_id carId ,t.create_time
         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.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,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'
         left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
+        left join t_dict t3 on t.lease_type = t3.status_cd and t3.table_name = 'owner_car' and t3.table_columns = 'lease_type'
         where 1=1
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd = #{statusCd}
@@ -155,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>
@@ -188,8 +200,14 @@
         <if test="ownerId !=null and ownerId != ''">
             and t.owner_id= #{ownerId}
         </if>
+        <if test="leaseType !=null and leaseType != ''">
+            and t.lease_type= #{leaseType}
+        </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}
@@ -259,6 +277,9 @@
         </if>
         <if test="ownerId !=null and ownerId != ''">
             , t.owner_id= #{ownerId}
+        </if>
+        <if test="leaseType !=null and leaseType != ''">
+            , t.lease_type= #{leaseType}
         </if>
         <if test="userId !=null and userId != ''">
             , t.user_id= #{userId}
@@ -345,9 +366,15 @@
         <if test="ownerId !=null and ownerId != ''">
             and t.owner_id= #{ownerId}
         </if>
+        <if test="leaseType !=null and leaseType != ''">
+            and t.lease_type= #{leaseType}
+        </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}
         </if>

--
Gitblit v1.8.0