From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 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 de72e66..1145ec5 100755
--- a/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
@@ -133,6 +133,9 @@
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,t4.name carTypeCdName
+ <if test="carTypeCd != '1003'">
+ ,count(moc.member_id) memberCarCount
+ </if>
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'
@@ -142,6 +145,9 @@
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'
+ <if test="carTypeCd != '1003'">
+ left join owner_car moc on t.car_id = moc.car_id and moc.car_type_cd != t.car_type_cd and moc.car_type_cd = '1002'
+ </if>
where 1=1
<if test="statusCd !=null and statusCd != ''">
and t.status_cd = #{statusCd}
@@ -176,6 +182,12 @@
<if test="carNumLike !=null and carNumLike != ''">
and t.car_num like concat('%',#{carNumLike},'%')
</if>
+ <if test="memberCarNum !=null and memberCarNum != '' and carTypeCd != '1003'">
+ and moc.car_num= #{memberCarNum}
+ </if>
+ <if test="memberCarNumLike !=null and memberCarNumLike != '' and carTypeCd != '1003' ">
+ and moc.car_num like concat('%',#{memberCarNumLike},'%')
+ </if>
<if test="carNums !=null">
and t.car_num in
<foreach collection="carNums" item="item" index="index" open="(" close=")" separator=",">
@@ -205,6 +217,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}
@@ -241,6 +256,14 @@
</if>
<if test="valid == 2">
and t.ps_id= '-1'
+ </if>
+ <if test="carTypeCd != '1003'">
+ GROUP BY t.car_color,t.car_brand,t.car_type,t1.name,
+ t.car_num,t.ps_id,t.remark,t.status_cd,t.owner_id,
+ t.b_id,t.user_id,t.car_id,t.create_time
+ ,t.community_id ,bow.name,bow.id_card ,bow.link,t2.name,t.start_time,t.end_time,t.state,
+ t.car_type_cd,t.member_id,ps.num,t.lease_type ,
+ t3.name ,t4.name
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -313,10 +336,13 @@
<select id="queryOwnerCarsCount" parameterType="Map" resultType="Map">
select count(1) count
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 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'
+ <if test="memberCarNumLike !=null and memberCarNumLike != ''">
+ left join owner_car moc on t.car_id = moc.car_id and moc.car_type_cd != t.car_type_cd and moc.car_type_cd = '1002'
+ </if>
where 1=1
<if test="statusCd !=null and statusCd != ''">
and t.status_cd = #{statusCd}
@@ -345,6 +371,12 @@
<if test="carNumLike !=null and carNumLike != ''">
and t.car_num like concat('%',#{carNumLike},'%')
</if>
+ <if test="memberCarNum !=null and memberCarNum != ''">
+ and moc.car_num= #{memberCarNum}
+ </if>
+ <if test="memberCarNumLike !=null and memberCarNumLike != ''">
+ and moc.car_num like concat('%',#{memberCarNumLike},'%')
+ </if>
<if test="carNums !=null">
and t.car_num in
<foreach collection="carNums" item="item" index="index" open="(" close=")" separator=",">
@@ -369,6 +401,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>
@@ -390,6 +425,12 @@
#{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>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
--
Gitblit v1.8.0