From 781c2e20a4bb844dae3f4eafbf5f0e494b942ea8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 25 五月 2023 18:07:08 +0800
Subject: [PATCH] optimize
---
java110-db/src/main/resources/mapper/community/VisitServiceDaoImplMapper.xml | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/VisitServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/VisitServiceDaoImplMapper.xml
index e5b5ef9..f79ecec 100755
--- a/java110-db/src/main/resources/mapper/community/VisitServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/VisitServiceDaoImplMapper.xml
@@ -7,10 +7,11 @@
<insert id="saveBusinessVisitInfo" parameterType="Map">
insert into business_visit_info(departure_time, v_name, visit_gender, owner_id, user_id, v_id, phone_number,
operate, visit_case, community_id, b_id, visit_time, car_num, entourage,
- reason_type, state, state_remark, ps_id, free_time, record_state)
+ reason_type, state, state_remark, ps_id, free_time, record_state, car_state,
+ car_remark, room_id)
values (#{departureTime}, #{vName}, #{visitGender}, #{ownerId}, #{userId}, #{vId}, #{phoneNumber}, #{operate},
#{visitCase}, #{communityId}, #{bId}, #{visitTime}, #{carNum}, #{entourage}, #{reasonType}, #{state},
- #{stateRemark}, #{psId}, #{freeTime}, #{recordState})
+ #{stateRemark}, #{psId}, #{freeTime}, #{recordState}, #{carState}, #{carStateRemark}, #{roomId})
</insert>
<!-- 鏌ヨ璁垮淇℃伅淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
@@ -21,7 +22,9 @@
visitCase,t.community_id,t.community_id communityId,t.b_id,t.b_id ,t.car_num,t.car_num carNum,t.entourage,
t.reason_type,t.reason_type reasonType,t.state,t.state_remark,t.state_remark
stateRemark,t.create_time,t.create_time createTime,t.ps_id,t.ps_id psId,t.free_time,t.free_time freeTime,
- t.record_state,t.record_state recordState
+ t.record_state,t.record_state recordState,t.car_state,t.car_state carState,t.car_remark,t.car_remark,
+ t.room_id,t.room_id roomId
+ carStateRemark
from business_visit_info t
where 1 =1
<if test="departureTime !=null ">
@@ -75,6 +78,15 @@
<if test="stateRemark !=null and stateRemark != ''">
and t.state_remark= #{stateRemark}
</if>
+ <if test="carState !=null and carState != ''">
+ and t.car_state= #{carState}
+ </if>
+ <if test="carStateRemark !=null and carStateRemark != ''">
+ and t.car_remark= #{carStateRemark}
+ </if>
+ <if test="roomId !=null and roomId != ''">
+ and t.room_id= #{roomId}
+ </if>
<if test="psId !=null and psId != ''">
and t.ps_id= #{psId}
</if>
@@ -90,10 +102,10 @@
<insert id="saveVisitInfoInstance" parameterType="Map">
insert into s_visit_info(
departure_time,v_name,status_cd,visit_gender,owner_id,user_id,v_id,visit_time,phone_number,visit_case,community_id,b_id,car_num,
- entourage,reason_type,state,state_remark,ps_id,free_time,record_state
+ entourage,reason_type,state,state_remark,ps_id,free_time,record_state,car_state,car_remark,room_id
) select
t.departure_time,t.v_name,'0',t.visit_gender,t.owner_id,t.user_id,t.v_id,t.visit_time,t.phone_number,t.visit_case,t.community_id,t.b_id,
- t.car_num,t.entourage,t.reason_type,t.state,t.state_remark,t.ps_id,t.free_time,t.record_state
+ t.car_num,t.entourage,t.reason_type,t.state,t.state_remark,t.ps_id,t.free_time,t.record_state,t.car_state,t.car_remark,t.room_id
from business_visit_info t where 1=1
<if test="departureTime !=null ">
and t.departure_time= #{departureTime}
@@ -140,6 +152,15 @@
<if test="stateRemark !=null and stateRemark != ''">
and t.state_remark= #{stateRemark}
</if>
+ <if test="carState !=null and carState != ''">
+ and t.car_state= #{carState}
+ </if>
+ <if test="carStateRemark !=null and carStateRemark != ''">
+ and t.car_remark= #{carStateRemark}
+ </if>
+ <if test="roomId !=null and roomId != ''">
+ and t.room_id= #{roomId}
+ </if>
<if test="psId !=null and psId != ''">
and t.ps_id= #{psId}
</if>
@@ -165,13 +186,15 @@
reasonType,t.state,t.state_remark,t.state_remark stateRemark,td.name stateName,t.create_time,
t.create_time createTime,t.ps_id,t.ps_id psId,t.free_time,t.free_time freeTime,
t.record_state,t.record_state recordState,ps.num parkingSpaceNum,pa.num parkingAreaName,bo.name ownerName,
- fr.file_real_name fileRealName,fr.file_save_name fileSaveName
+ t.car_state,t.car_state carState,t.car_remark,t.car_remark carStateRemark,td2.name carStateName,
+ t.room_id,t.room_id roomId
from s_visit_info t
left join t_dict td on t.state = td.status_cd and td.table_name = 's_visit_info' and td.table_columns = 'state'
+ left join t_dict td2 on t.car_state = td2.status_cd and td2.table_name = 's_visit_info' and td2.table_columns =
+ 'car_state'
left join parking_space ps on t.ps_id = ps.ps_id and ps.status_cd = '0'
- left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
+ left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
left join building_owner bo on t.owner_id = bo.owner_id and bo.owner_type_cd = '1001' and bo.status_cd = '0'
- left join file_rel fr on fr.obj_id = t.v_id and fr.status_cd = '0'
where 1 = 1
<if test="departureTime !=null ">
and t.departure_time= #{departureTime}
@@ -190,6 +213,12 @@
</if>
<if test="vId !=null and vId != ''">
and t.v_id= #{vId}
+ </if>
+ <if test="vIds !=null">
+ and t.v_id in
+ <foreach collection="vIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="visitTime !=null ">
and t.visit_time= #{visitTime}
@@ -239,14 +268,26 @@
<if test="stateRemark !=null and stateRemark != ''">
and t.state_remark= #{stateRemark}
</if>
+ <if test="carState !=null and carState != ''">
+ and t.car_state= #{carState}
+ </if>
+ <if test="carStateRemark !=null and carStateRemark != ''">
+ and t.car_remark= #{carStateRemark}
+ </if>
+ <if test="roomId !=null and roomId != ''">
+ and t.room_id= #{roomId}
+ </if>
<if test="carNumNoEmpty !=null and carNumNoEmpty != ''">
- and t.car_num!= ""
+ and t.car_num != ""
</if>
<if test="sameDay !=null and sameDay != ''">
and TO_DAYS(t.create_time) = TO_DAYS(NOW())
</if>
<if test="flag != null and flag == '1'">
and t.ps_id != '' and t.ps_id != '-1' and t.ps_id is not null
+ </if>
+ <if test="sign != null and sign != ''">
+ and t.v_id != #{sign}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -308,6 +349,15 @@
<if test="stateRemark !=null and stateRemark != ''">
, t.state_remark= #{stateRemark}
</if>
+ <if test="carState !=null and carState != ''">
+ , t.car_state= #{carState}
+ </if>
+ <if test="carStateRemark !=null and carStateRemark != ''">
+ , t.car_remark= #{carStateRemark}
+ </if>
+ <if test="roomId !=null and roomId != ''">
+ , t.room_id= #{roomId}
+ </if>
<if test="psId !=null and psId != ''">
, t.ps_id= #{psId}
</if>
@@ -326,7 +376,7 @@
from s_visit_info t
left join t_dict td on t.state = td.status_cd and td.table_name = 's_visit_info' and td.table_columns = 'state'
left join parking_space ps on t.ps_id = ps.ps_id and ps.status_cd = '0'
- left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
+ left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
left join building_owner bo on t.owner_id = bo.owner_id and bo.owner_type_cd = '1001' and bo.status_cd = '0'
left join file_rel fr on fr.obj_id = t.v_id and fr.status_cd = '0'
where 1 = 1
@@ -390,6 +440,15 @@
<if test="stateRemark !=null and stateRemark != ''">
and t.state_remark= #{stateRemark}
</if>
+ <if test="carState !=null and carState != ''">
+ and t.car_state= #{carState}
+ </if>
+ <if test="carStateRemark !=null and carStateRemark != ''">
+ and t.car_remark= #{carStateRemark}
+ </if>
+ <if test="roomId !=null and roomId != ''">
+ and t.room_id= #{roomId}
+ </if>
<if test="psId !=null and psId != ''">
and t.ps_id= #{psId}
</if>
--
Gitblit v1.8.0