From 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 16:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml | 149 ++++++++++++++++++++++++++++---------------------
1 files changed, 84 insertions(+), 65 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 60c71d8..17116d1
--- a/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
@@ -7,17 +7,26 @@
<!-- 淇濆瓨鍋滆溅浣嶄俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveBusinessParkingSpaceInfo" parameterType="Map">
insert into business_parking_space(
- area,operate,type_cd,num,ps_id,remark,state,community_id,b_id,user_id
+ area,operate,num,ps_id,pa_id, remark,state,community_id,b_id,parking_type
) values (
- #{area},#{operate},#{typeCd},#{num},#{psId},#{remark},#{state},#{communityId},#{bId},#{userId}
+ #{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.type_cd,t.type_cd typeCd,t.num,t.ps_id,t.ps_id
- psId,t.remark,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.user_id,t.user_id userId
+ 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
from business_parking_space t
where 1 =1
<if test="area !=null and area != ''">
@@ -26,14 +35,15 @@
<if test="operate !=null and operate != ''">
and t.operate= #{operate}
</if>
- <if test="typeCd !=null and typeCd != ''">
- and t.type_cd= #{typeCd}
- </if>
+
<if test="num !=null and num != ''">
and t.num= #{num}
</if>
<if test="psId !=null and psId != ''">
and t.ps_id= #{psId}
+ </if>
+ <if test="paId !=null and paId != ''">
+ and t.pa_id= #{paId}
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -48,31 +58,28 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
-
</select>
<!-- 淇濆瓨鍋滆溅浣嶄俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveParkingSpaceInfoInstance" parameterType="Map">
- insert into p_parking_space(
- area,type_cd,num,ps_id,remark,status_cd,state,community_id,b_id,user_id
- ) select t.area,t.type_cd,t.num,t.ps_id,t.remark,'0',t.state,t.community_id,t.b_id,t.user_id from
+ insert into parking_space(
+ 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="typeCd !=null and typeCd != ''">
- and t.type_cd= #{typeCd}
- </if>
<if test="num !=null and num != ''">
and t.num= #{num}
</if>
<if test="psId !=null and psId != ''">
and t.ps_id= #{psId}
+ </if>
+ <if test="paId !=null and paId != ''">
+ and t.pa_id= #{paId}
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -86,53 +93,63 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
-
</insert>
<!-- 鏌ヨ鍋滆溅浣嶄俊鎭� add by wuxw 2018-07-03 -->
<select id="getParkingSpaceInfo" parameterType="Map" resultType="Map">
SELECT
- t.area,
- t.`type_cd` typeCd,
- t.`type_cd`,
- t.num,
- t.ps_id psId,
- t.ps_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.user_id,
- t.user_id userId,
- td.name stateName
+ 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
FROM
- p_parking_space t,t_dict td
+ 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='p_parking_space'
- and td.table_columns='state'
<if test="area !=null and area != ''">
and t.area= #{area}
- </if>
- <if test="typeCd !=null and typeCd != ''">
- and t.type_cd= #{typeCd}
</if>
<if test="num !=null and num != ''">
and t.num= #{num}
</if>
+ <if test="areaNum !=null and areaNum != ''">
+ and pa.num= #{areaNum}
+ </if>
<if test="psId !=null and psId != ''">
and t.ps_id= #{psId}
</if>
+ <if test="paId !=null and paId != ''">
+ and t.pa_id= #{paId}
+ </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}
@@ -140,7 +157,7 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
- <if test="states != null and states != null">
+ <if test="states != null">
and t.state in
<foreach collection="states" item="item" open="(" close=")" separator=",">
#{item}
@@ -158,10 +175,7 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
-
+ order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -171,18 +185,18 @@
<!-- 淇敼鍋滆溅浣嶄俊鎭� add by wuxw 2018-07-03 -->
<update id="updateParkingSpaceInfoInstance" parameterType="Map">
- update p_parking_space t set t.status_cd = #{statusCd}
+ update parking_space t set t.status_cd = #{statusCd}
<if test="newBId != null and newBId != ''">
,t.b_id = #{newBId}
</if>
<if test="area !=null and area != ''">
, t.area= #{area}
</if>
- <if test="typeCd !=null and typeCd != ''">
- , t.type_cd= #{typeCd}
- </if>
<if test="num !=null and num != ''">
, t.num= #{num}
+ </if>
+ <if test="paId !=null and paId != ''">
+ , t.pa_id= #{paId}
</if>
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
@@ -193,8 +207,8 @@
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if>
- <if test="userId !=null and userId != ''">
- , t.user_id= #{userId}
+ <if test="parkingType != null and parkingType != ''">
+ ,t.parking_type = #{parkingType}
</if>
where 1=1
<if test="psId !=null and psId != ''">
@@ -203,25 +217,33 @@
<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 p_parking_space t
- where 1 =1
+ FROM
+ parking_space t,t_dict td,parking_area pa
+ 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>
- <if test="typeCd !=null and typeCd != ''">
- and t.type_cd= #{typeCd}
</if>
<if test="num !=null and num != ''">
and t.num= #{num}
</if>
+ <if test="areaNum !=null and areaNum != ''">
+ and pa.num= #{areaNum}
+ </if>
<if test="psId !=null and psId != ''">
and t.ps_id= #{psId}
+ </if>
+ <if test="paId !=null and paId != ''">
+ and t.pa_id= #{paId}
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -243,9 +265,6 @@
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
- </if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
</if>
--
Gitblit v1.8.0