From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug
---
java110-db/src/main/resources/mapper/common/CarInoutV1ServiceDaoImplMapper.xml | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/CarInoutV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/CarInoutV1ServiceDaoImplMapper.xml
index 3e1704f..be21bc2 100644
--- a/java110-db/src/main/resources/mapper/common/CarInoutV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/CarInoutV1ServiceDaoImplMapper.xml
@@ -19,8 +19,9 @@
<select id="getCarInoutInfo" parameterType="Map" resultType="Map">
select t.in_time,t.in_time inTime,t.inout_id,t.inout_id inoutId,t.pa_id,t.pa_id paId,t.car_num,t.car_num
carNum,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.out_time,t.out_time
- outTime
+ outTime,td.`name` stateName
from car_inout t
+ left join t_dict td on t.state = td.status_cd and td.table_columns='state' and td.table_name = 'car_inout'
where 1 =1
<if test="inTime !=null and inTime != ''">
and t.in_time= #{inTime}
@@ -31,6 +32,12 @@
<if test="paId !=null and paId != ''">
and t.pa_id= #{paId}
</if>
+ <if test="paIds !=null">
+ and t.pa_id in
+ <foreach collection="paIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="carNum !=null and carNum != ''">
and t.car_num= #{carNum}
</if>
@@ -39,6 +46,12 @@
</if>
<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}
@@ -63,17 +76,11 @@
<if test="inTime !=null and inTime != ''">
, t.in_time= #{inTime}
</if>
- <if test="paId !=null and paId != ''">
- , t.pa_id= #{paId}
- </if>
<if test="carNum !=null and carNum != ''">
, t.car_num= #{carNum}
</if>
<if test="state !=null and state != ''">
, t.state= #{state}
- </if>
- <if test="communityId !=null and communityId != ''">
- , t.community_id= #{communityId}
</if>
<if test="outTime !=null and outTime != ''">
, t.out_time= #{outTime}
@@ -81,6 +88,12 @@
where 1=1
<if test="inoutId !=null and inoutId != ''">
and t.inout_id= #{inoutId}
+ </if>
+ <if test="paId !=null and paId != ''">
+ and t.pa_id= #{paId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
</if>
</update>
@@ -99,6 +112,12 @@
<if test="paId !=null and paId != ''">
and t.pa_id= #{paId}
</if>
+ <if test="paIds !=null">
+ and t.pa_id in
+ <foreach collection="paIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="carNum !=null and carNum != ''">
and t.car_num= #{carNum}
</if>
@@ -108,6 +127,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>
--
Gitblit v1.8.0