From cddd83f139af1786517759277ced8479cbe80d3b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 12:57:09 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml | 98 +++++++++++++++++++++++++-----------------------
1 files changed, 51 insertions(+), 47 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
index 60c71d8..7d0f24a 100644
--- a/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
@@ -7,17 +7,18 @@
<!-- 淇濆瓨鍋滆溅浣嶄俊鎭� 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
) values (
- #{area},#{operate},#{typeCd},#{num},#{psId},#{remark},#{state},#{communityId},#{bId},#{userId}
+ #{area},#{operate},#{num},#{psId},#{paId},#{remark},#{state},#{communityId},#{bId}
)
</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 +27,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 +50,30 @@
<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
+ ) select t.area,t.num,t.ps_id,t.pa_id,t.remark,'0',t.state,t.community_id,t.b_id 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,9 +87,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>
+
</insert>
@@ -97,11 +96,11 @@
<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.pa_id paId,
+ t.pa_id,
t.remark,
t.status_cd statusCd,
t.status_cd,
@@ -110,26 +109,32 @@
t.community_id communityId,
t.b_id,
t.b_id bId,
- t.user_id,
- t.user_id userId,
- td.name stateName
+ td.name stateName,
+ pa.num areaNum,
+ pa.type_cd typeCd
FROM
- p_parking_space t,t_dict td
+ parking_space t,t_dict td,parking_area pa
+
<where>
t.state = td.status_cd
- and td.table_name='p_parking_space'
+ 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}
@@ -158,9 +163,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}
@@ -171,15 +174,12 @@
<!-- 淇敼鍋滆溅浣嶄俊鎭� 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}
@@ -192,9 +192,6 @@
</if>
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
- </if>
- <if test="userId !=null and userId != ''">
- , t.user_id= #{userId}
</if>
where 1=1
<if test="psId !=null and psId != ''">
@@ -209,19 +206,28 @@
<!-- 鏌ヨ鍋滆溅浣嶆暟閲� 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}
@@ -244,9 +250,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>
+
</select>
--
Gitblit v1.8.0