yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改小时统计

Browse Source
This commit is contained in:
yuyang 2021-11-11 01:22:40 +08:00
parent 63227d69b8
commit 69fa32b79d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
View File

@ -610,7 +610,7 @@
left join xhpc_terminal as ter on ter.terminal_id = ho.terminal_id left join xhpc_terminal as ter on ter.terminal_id = ho.terminal_id
left join xhpc_charging_pile as cp on cp.charging_pile_id = ter.charging_pile_id left join xhpc_charging_pile as cp on cp.charging_pile_id = ter.charging_pile_id
left join et_dispute_orders as ed on ed.start_charge_seq = ho.internet_serial_number and ed.dispute_order_status !=2 left join et_dispute_orders as ed on ed.start_charge_seq = ho.internet_serial_number and ed.dispute_order_status !=2
where ho.status =0 and ho.del_flag=0 and ho.total_price !=null where ho.status =0 and ho.del_flag=0 and ho.total_price !=0
<if test="type !=null"> <if test="type !=null">
and ho.type=#{type} and ho.type=#{type}
</if> </if>
@ -624,7 +624,7 @@
and ho.serial_number like concat('%', #{transactionNumber}, '%') and ho.serial_number like concat('%', #{transactionNumber}, '%')
</if> </if>
<if test="chargingStationName !=null and chargingStationName !=''"> <if test="chargingStationName !=null and chargingStationName !=''">
and ct.name like concat('%', #{transactionNumber}, '%') and ct.name like concat('%', #{chargingStationName}, '%')
</if> </if>
<if test="operatorId !=null"> <if test="operatorId !=null">
and op.operator_id =#{operatorId} and op.operator_id =#{operatorId}
@ -670,8 +670,13 @@
from xhpc_rate_time as rt from xhpc_rate_time as rt
left join xhpc_rate ra on rt.rate_id =ra.rate_id left join xhpc_rate ra on rt.rate_id =ra.rate_id
where rt.rate_model_id=#{rateModelId} where rt.rate_model_id=#{rateModelId}
and ((rt.start_time &lt; #{startTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt; #{startTime}) and (
or (rt.start_time &lt; #{endTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt; #{endTime})) (rt.start_time &lt;= #{startTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt;= #{endTime} )
OR
(rt.start_time &lt;= #{startTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt;= #{startTime} and replace(rt.end_time, '00:00:00', '23:59:59') &lt;= #{endTime})
OR
(rt.start_time &lt;= #{endTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt;= #{endTime})
)
</select> </select>
<select id="getById" resultType="map"> <select id="getById" resultType="map">