|
|
@@ -20,7 +20,9 @@
|
|
|
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,t.state,
|
|
|
- ci.in_time inTime,ci.out_time outTime,max(cip.real_charge) realCharge,ci.pa_id paId,td.name stateName,t.remark,t.car_type carType
|
|
|
+ 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
|
|
|
@@ -75,8 +77,8 @@
|
|
|
<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
|
|
|
+<!-- 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.create_time desc
|
|
|
<if test="page != -1 and page != null ">
|
|
|
limit #{page}, #{row}
|