From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/community/ParkingSpaceV1ServiceDaoImplMapper.xml |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/ParkingSpaceV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/ParkingSpaceV1ServiceDaoImplMapper.xml
index e937a68..9be67b3 100644
--- a/java110-db/src/main/resources/mapper/community/ParkingSpaceV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ParkingSpaceV1ServiceDaoImplMapper.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="parkingSpaceV1ServiceDaoImpl">
 
-
     <!-- 淇濆瓨杞︿綅淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveParkingSpaceInfo" parameterType="Map">
-        insert into parking_space(
-        area,parking_type,num,pa_id,ps_id,remark,state,community_id
-        ) values (
-        #{area},#{parkingType},#{num},#{paId},#{psId},#{remark},#{state},#{communityId}
-        )
+        insert into parking_space(area, parking_type, num, pa_id, ps_id, remark, state, community_id)
+        values (#{area}, #{parkingType}, #{num}, #{paId}, #{psId}, #{remark}, #{state}, #{communityId})
     </insert>
-
 
     <!-- 鏌ヨ杞︿綅淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getParkingSpaceInfo" parameterType="Map" resultType="Map">
@@ -51,6 +45,12 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="states !=null">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -58,9 +58,7 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
-
 
     <!-- 淇敼杞︿綅淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateParkingSpaceInfo" parameterType="Map">
@@ -93,7 +91,6 @@
         <if test="psId !=null and psId != ''">
             and t.ps_id= #{psId}
         </if>
-
     </update>
 
     <!-- 鏌ヨ杞︿綅鏁伴噺 add by wuxw 2018-07-03 -->
@@ -131,11 +128,15 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="states !=null">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-
-
     </select>
 
     <!-- 淇濆瓨杞︿綅淇℃伅 add by wuxw 2018-07-03 -->
@@ -147,5 +148,4 @@
             (#{item.area},#{item.parkingType},#{item.num},#{item.paId},#{item.psId},#{item.remark},#{item.state},#{item.communityId},#{item.createTime})
         </foreach>
     </insert>
-
 </mapper>

--
Gitblit v1.8.0