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 | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
index dbf43eb..7d0f24a 100644
--- a/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml
@@ -59,7 +59,7 @@
<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.t.num,t.ps_id,t.pa_id,t.remark,'0',t.state,t.community_id,t.b_id from
+ ) 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}
@@ -110,9 +110,11 @@
t.b_id,
t.b_id bId,
td.name stateName,
- pa.num areaNum
+ pa.num areaNum,
+ pa.type_cd typeCd
FROM
parking_space t,t_dict td,parking_area pa
+
<where>
t.state = td.status_cd
and td.table_name='parking_space'
@@ -124,6 +126,9 @@
</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}
@@ -215,6 +220,9 @@
<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>
--
Gitblit v1.8.0