From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/common/CarInoutDetailV1ServiceDaoImplMapper.xml | 68 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/CarInoutDetailV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/CarInoutDetailV1ServiceDaoImplMapper.xml
index 1c6968b..7704b63 100644
--- a/java110-db/src/main/resources/mapper/common/CarInoutDetailV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/CarInoutDetailV1ServiceDaoImplMapper.xml
@@ -8,9 +8,9 @@
<!-- 淇濆瓨杞﹁締杩涘嚭鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveCarInoutDetailInfo" parameterType="Map">
insert into car_inout_detail(
- inout_id,machine_id,machine_code,car_inout,pa_id,detail_id,car_num,community_id,remark
+ inout_id,machine_id,machine_code,car_inout,pa_id,detail_id,car_num,community_id,remark,state,car_type,car_type_name,photo_jpg
) values (
- #{inoutId},#{machineId},#{machineCode},#{carInout},#{paId},#{detailId},#{carNum},#{communityId},#{remark}
+ #{inoutId},#{machineId},#{machineCode},#{carInout},#{paId},#{detailId},#{carNum},#{communityId},#{remark},#{state},#{carType},#{carTypeName},#{photoJpg}
)
</insert>
@@ -19,13 +19,19 @@
<select id="getCarInoutDetailInfo" parameterType="Map" resultType="Map">
select t.inout_id,t.inout_id inoutId,t.machine_id,t.machine_id machineId,t.machine_code,t.machine_code
machineCode,t.car_inout,t.car_inout carInout,t.pa_id,t.pa_id paId,t.detail_id,t.detail_id
- detailId,t.car_num,t.car_num carNum,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,
- ci.in_time inTime,ci.out_time outTime,cip.real_charge realCharge,ci.pa_id paId,td.name stateName,t.remark
+ detailId,t.car_num,t.car_num carNum,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.state,
+ ci.in_time inTime,ci.out_time outTime,
+ (select max(cip.real_charge) from car_inout_payment cip where cip.inout_id = ci.inout_id and cip.community_id = ci.community_id) realCharge,
+ ci.pa_id paId,td.name stateName,t.remark,t.car_type carType
+ ,pa.num areaNum,tcfc.fee_name feeName,tcfc.config_id configId,t.car_type_name carTypeName,ci.state inState,t.photo_jpg photoJpg
from car_inout_detail t
left join car_inout ci on t.inout_id = ci.inout_id and ci.status_cd = '0' and t.community_id = ci.community_id
left join car_inout_payment cip on cip.inout_id = ci.inout_id and cip.community_id = ci.community_id
- left join t_dict td on ci.state = td.status_cd and td.table_columns='state' and td.table_name = 'car_inout'
+ left join t_dict td on t.state = td.status_cd and td.table_columns='state' and td.table_name = 'car_inout'
+ left join parking_area pa on ci.pa_id = pa.pa_id and pa.status_cd = '0'
+ left join temp_car_fee_config tcfc on pa.pa_id = tcfc.pa_id and tcfc.status_cd = '0'
where 1 =1
+
<if test="inoutId !=null and inoutId != ''">
and t.inout_id= #{inoutId}
</if>
@@ -51,7 +57,13 @@
and t.detail_id= #{detailId}
</if>
<if test="carNum !=null and carNum != ''">
- and t.car_num= #{carNum}
+ and t.car_num like concat('%',#{carNum},'%')
+ </if>
+ <if test="carType !=null and carType != ''">
+ and t.car_type= #{carType}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -59,7 +71,15 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- order by t.create_time desc
+ <if test="startTime !=null and startTime != ''">
+ and t.create_time > #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.create_time < #{endTime}
+ </if>
+<!-- group by t.inout_id,t.machine_id,t.machine_code,t.car_inout,t.pa_id,t.detail_id,t.car_num,t.status_cd,t.community_id,-->
+<!-- ci.in_time ,ci.out_time ,ci.pa_id ,td.name,t.remark,pa.num ,tcfc.fee_name ,tcfc.config_id,t.create_time,t.car_type_name,td.name,t.state,t.car_type-->
+ order by t.detail_id desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -73,9 +93,7 @@
<if test="newBId != null and newBId != ''">
,t.b_id = #{newBId}
</if>
- <if test="inoutId !=null and inoutId != ''">
- , t.inout_id= #{inoutId}
- </if>
+
<if test="machineId !=null and machineId != ''">
, t.machine_id= #{machineId}
</if>
@@ -91,15 +109,27 @@
<if test="carNum !=null and carNum != ''">
, t.car_num= #{carNum}
</if>
+ <if test="carType !=null and carType != ''">
+ , t.car_type= #{carType}
+ </if>
+ <if test="carTypeName !=null and carTypeName != ''">
+ , t.car_type_name= #{carTypeName}
+ </if>
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if>
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
</if>
+ <if test="photoJpg !=null and photoJpg != ''">
+ , t.photo_jpg= #{photoJpg}
+ </if>
where 1=1
<if test="detailId !=null and detailId != ''">
and t.detail_id= #{detailId}
+ </if>
+ <if test="inoutId !=null and inoutId != ''">
+ and t.inout_id= #{inoutId}
</if>
</update>
@@ -108,8 +138,8 @@
<select id="queryCarInoutDetailsCount" parameterType="Map" resultType="Map">
select count(1) count
from car_inout_detail t
- left join car_inout ci on t.inout_id = ci.inout_id and ci.status_cd = '0' and t.community_id = ci.community_id
- left join car_inout_payment cip on cip.inout_id = ci.inout_id and cip.community_id = ci.community_id
+<!-- left join car_inout ci on t.inout_id = ci.inout_id and ci.status_cd = '0' and t.community_id = ci.community_id-->
+<!-- left join car_inout_payment cip on cip.inout_id = ci.inout_id and cip.community_id = ci.community_id-->
where 1 = 1
<if test="inoutId !=null and inoutId != ''">
and t.inout_id= #{inoutId}
@@ -136,7 +166,13 @@
and t.detail_id= #{detailId}
</if>
<if test="carNum !=null and carNum != ''">
- and t.car_num= #{carNum}
+ and t.car_num like concat('%',#{carNum},'%')
+ </if>
+ <if test="carType !=null and carType != ''">
+ and t.car_type= #{carType}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -144,6 +180,12 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ <if test="startTime !=null and startTime != ''">
+ and t.create_time > #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.create_time < #{endTime}
+ </if>
</select>
--
Gitblit v1.8.0