From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
index 8389ec0..e028571 100755
--- a/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
@@ -15,7 +15,6 @@
)
</insert>
-
<!-- 鏌ヨ杞﹁締绠＄悊淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessOwnerCarInfo" parameterType="Map" resultType="Map">
select t.car_color,t.car_color carColor,t.car_brand,t.car_brand carBrand,t.car_type,t.car_type
@@ -67,9 +66,7 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
</select>
-
<!-- 淇濆瓨杞﹁締绠＄悊淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveOwnerCarInfoInstance" parameterType="Map">
@@ -120,7 +117,6 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
</insert>
@@ -132,13 +128,15 @@
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
+ t.car_type_cd,t.car_type_cd carTypeCd,t.member_id,t.member_id memberId,ps.num,pa.num areaNum
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 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'
where 1=1
-
<if test="statusCd !=null and statusCd != ''">
and t.status_cd = #{statusCd}
</if>
@@ -153,6 +151,12 @@
</if>
<if test="carTypeCd !=null and carTypeCd != ''">
and t.car_type_cd= #{carTypeCd}
+ </if>
+ <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="carNum !=null and carNum != ''">
and t.car_num= #{carNum}
@@ -227,9 +231,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼杞﹁締绠＄悊淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateOwnerCarInfoInstance" parameterType="Map">
@@ -295,7 +297,7 @@
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.owner_id and bow.status_cd = '0' and bow.community_id =
+ left join building_owner bow on t.owner_id = bow.member_id and bow.status_cd = '0' and bow.community_id =
t.community_id
where 1=1
<if test="statusCd !=null and statusCd != ''">
@@ -312,6 +314,12 @@
</if>
<if test="carTypeCd !=null and carTypeCd != ''">
and t.car_type_cd= #{carTypeCd}
+ </if>
+ <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="carNum !=null and carNum != ''">
and t.car_num= #{carNum}
@@ -376,7 +384,6 @@
<if test="valid == 2">
and t.ps_id= '-1'
</if>
- group by t.car_id
</select>
@@ -384,7 +391,7 @@
select count(DISTINCT t.ps_id) count
from owner_car t
where
- t.ps_id != '-1'
+ t.ps_id != '-1'
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
--
Gitblit v1.8.0