Lianxun_Java.git

			@@ -19,13 +19,12 @@
			<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,td.`name` stateName,pa.num areaNum,tcfc.fee_name feeName,tcfc.config_id configId,max(cid.car_type) carType,max(td2.`name`) carTypeName
			outTime,td.`name` stateName,pa.num areaNum,tcfc.fee_name feeName,tcfc.config_id configId,max(cid.car_type) carType,max(cid.car_type_name) carTypeName
			from car_inout t
			LEFT JOIN car_inout_detail cid on t.inout_id = cid.inout_id and cid.status_cd = '0' and cid.state in ('100300','100400','100600')
			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 t.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'
			LEFT JOIN t_dict td2 on cid.car_type = td2.status_cd and td2.table_name = 'owner_car' and td2.table_columns = 'lease_type'
			where 1 =1
			<if test="inTime !=null and inTime != ''">
			and t.in_time= #{inTime}
			@@ -43,7 +42,7 @@
			</foreach>
			</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 cid.car_type= #{carType}
			@@ -132,7 +131,7 @@
			</foreach>
			</if>
			<if test="carNum !=null and carNum != ''">
			and t.car_num= #{carNum}
			and t.car_num like concat('%',#{carNum},'%')
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}