From 48c9414db4b7c44a43524115570796025d38a653 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 16:37:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
index 5cd178c..d9334d0 100755
--- a/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
@@ -15,7 +15,6 @@
         )
     </insert>
 
-
     <!-- 鏌ヨ杞﹁締绠＄悊淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessOwnerCarInfo" parameterType="Map" resultType="Map">
         select t.car_color,t.car_color carColor,t.car_brand,t.car_brand carBrand,t.car_type,t.car_type
@@ -67,9 +66,7 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-
     </select>
-
 
     <!-- 淇濆瓨杞﹁締绠＄悊淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveOwnerCarInfoInstance" parameterType="Map">
@@ -120,7 +117,6 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-
     </insert>
 
 
@@ -153,6 +149,12 @@
         </if>
         <if test="carTypeCd !=null and carTypeCd != ''">
             and t.car_type_cd= #{carTypeCd}
+        </if>
+        <if test="carTypeCds !=null">
+            and t.car_type_cd in
+            <foreach collection="carTypeCds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test="carNum !=null and carNum != ''">
             and t.car_num= #{carNum}
@@ -214,23 +216,20 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
-        <if test="valid == '1'">
+        <if test="valid == 1">
             and t.end_time &gt; now()
         </if>
-        <if test="valid == '0'">
+        <if test="valid == 3">
             and t.end_time &lt; now()
         </if>
-        <if test="valid == '2'">
+        <if test="valid == 2">
             and t.ps_id= '-1'
         </if>
-
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
-
 
     <!-- 淇敼杞﹁締绠＄悊淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateOwnerCarInfoInstance" parameterType="Map">
@@ -314,6 +313,12 @@
         <if test="carTypeCd !=null and carTypeCd != ''">
             and t.car_type_cd= #{carTypeCd}
         </if>
+        <if test="carTypeCds !=null">
+            and t.car_type_cd in
+            <foreach collection="carTypeCds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="carNum !=null and carNum != ''">
             and t.car_num= #{carNum}
         </if>
@@ -368,13 +373,13 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
-        <if test="valid == '1'">
+        <if test="valid == 1">
             and t.end_time &gt; now()
         </if>
-        <if test="valid == '0'">
+        <if test="valid == 3">
             and t.end_time &lt; now()
         </if>
-        <if test="valid == '2'">
+        <if test="valid == 2">
             and t.ps_id= '-1'
         </if>
 

--
Gitblit v1.8.0