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/community/ParkingSpaceServiceDaoImplMapper.xml | 101 +++++++++++++++++++++++++++++++-------------------
1 files changed, 63 insertions(+), 38 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index f121617..05c3467
--- a/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
@@ -7,18 +7,26 @@
<!-- 淇濆瓨鍋滆溅浣嶄俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveBusinessParkingSpaceInfo" parameterType="Map">
insert into business_parking_space(
- area,operate,num,ps_id,pa_id, remark,state,community_id,b_id
+ area,operate,num,ps_id,pa_id, remark,state,community_id,b_id,parking_type
) values (
- #{area},#{operate},#{num},#{psId},#{paId},#{remark},#{state},#{communityId},#{bId}
+ #{area},#{operate},#{num},#{psId},#{paId},#{remark},#{state},#{communityId},#{bId},#{parkingType}
)
</insert>
+ <!-- 淇濆瓨杞︿綅淇℃伅 -->
+ <insert id="saveParkingSpace" parameterType="Map">
+ insert into parking_space(
+ area,num,ps_id,pa_id,remark,state,community_id,b_id,parking_type,create_time
+ ) values (
+ #{area},#{num},#{psId},#{paId},#{remark},#{state},#{communityId},#{bId},#{parkingType},#{createTime}
+ )
+ </insert>
<!-- 鏌ヨ鍋滆溅浣嶄俊鎭紙Business锛� add by wuxw 2018-07-03 -->
<select id="getBusinessParkingSpaceInfo" parameterType="Map" resultType="Map">
select t.area,t.operate,t.num,t.ps_id,t.ps_id
psId,t.pa_id,t.pa_id
- paId,t.remark,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
+ paId,t.remark,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.parking_type,t.parking_type parkingType
from business_parking_space t
where 1 =1
<if test="area !=null and area != ''">
@@ -50,22 +58,23 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
-
+ <if test="parkingType !=null and parkingType != ''">
+ and t.parking_type= #{parkingType}
+ </if>
</select>
<!-- 淇濆瓨鍋滆溅浣嶄俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveParkingSpaceInfoInstance" parameterType="Map">
insert into parking_space(
- area,num,ps_id,pa_id,remark,status_cd,state,community_id,b_id
- ) select t.area,t.num,t.ps_id,t.pa_id,t.remark,'0',t.state,t.community_id,t.b_id from
+ area,num,ps_id,pa_id,remark,status_cd,state,community_id,b_id,parking_type
+ ) select t.area,t.num,t.ps_id,t.pa_id,t.remark,'0',t.state,t.community_id,t.b_id,t.parking_type
+ from
business_parking_space t where 1=1
<if test="area !=null and area != ''">
and t.area= #{area}
</if>
and t.operate= 'ADD'
-
<if test="num !=null and num != ''">
and t.num= #{num}
</if>
@@ -87,40 +96,47 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
-
+ <if test="parkingType !=null and parkingType != ''">
+ and t.parking_type= #{parkingType}
+ </if>
</insert>
<!-- 鏌ヨ鍋滆溅浣嶄俊鎭� add by wuxw 2018-07-03 -->
<select id="getParkingSpaceInfo" parameterType="Map" resultType="Map">
SELECT
- t.area,
- t.num,
- t.ps_id psId,
- t.ps_id,
- t.pa_id paId,
- t.pa_id,
- t.remark,
- t.status_cd statusCd,
- t.status_cd,
- t.`state`,
- t.community_id,
- t.community_id communityId,
- t.b_id,
- t.b_id bId,
- td.name stateName,
- pa.num areaNum,
- pa.type_cd typeCd
+ t.area,
+ t.num,
+ t.ps_id psId,
+ t.ps_id,
+ t.pa_id paId,
+ t.pa_id,
+ t.remark,
+ t.status_cd statusCd,
+ t.status_cd,
+ t.`state`,
+ t.community_id,
+ t.community_id communityId,
+ t.b_id,
+ t.b_id bId,
+ t.parking_type,
+ t.parking_type parkingType,
+ td2.NAME parkingTypeName,
+ td1.NAME stateName,
+ pa.num areaNum,
+ pa.type_cd typeCd,
+ t.create_time createTime
FROM
- parking_space t,t_dict td,parking_area pa
-
+ parking_space t
+ LEFT JOIN t_dict td1 ON t.state = td1.status_cd
+ AND td1.table_name = 'parking_space'
+ AND td1.table_columns = 'state'
+ LEFT JOIN t_dict td2 ON t.parking_type = td2.status_cd
+ AND td2.table_name = 'parking_space'
+ AND td2.table_columns = 'parking_type'
+ LEFT JOIN parking_area pa ON t.pa_id = pa.pa_id
+ AND pa.status_cd = '0'
<where>
- t.state = td.status_cd
- and td.table_name='parking_space'
- and td.table_columns='state'
- and t.pa_id = pa.pa_id
- and pa.status_cd ='0'
<if test="area !=null and area != ''">
and t.area= #{area}
</if>
@@ -138,6 +154,9 @@
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
+ </if>
+ <if test="parkingType !=null and parkingType != ''">
+ and t.parking_type= #{parkingType}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -157,6 +176,12 @@
#{item}
</foreach>
</if>
+ <if test="paIds != null ">
+ and t.pa_id in
+ <foreach collection="paIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
@@ -164,7 +189,6 @@
and t.b_id= #{bId}
</if>
order by t.create_time desc
-
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -196,6 +220,9 @@
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if>
+ <if test="parkingType != null and parkingType != ''">
+ ,t.parking_type = #{parkingType}
+ </if>
where 1=1
<if test="psId !=null and psId != ''">
and t.ps_id= #{psId}
@@ -203,14 +230,13 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ鍋滆溅浣嶆暟閲� add by wuxw 2018-07-03 -->
<select id="queryParkingSpacesCount" parameterType="Map" resultType="Map">
select count(1) count
FROM
- parking_space t,t_dict td,parking_area pa
+ parking_space t,t_dict td,parking_area pa
where
t.state = td.status_cd
and td.table_name='parking_space'
@@ -253,7 +279,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</select>
--
Gitblit v1.8.0