java110
2023-05-30 f14c50cb0036d3ddd655ce4e34732ba396a836c4
java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml
@@ -24,7 +24,7 @@
        machineId,t.acct_detail_id,t.acct_detail_id acctDetailId,t.person_id,t.person_id
        personId,t.charge_hours,t.charge_hours chargeHours,t.start_time,t.start_time startTime,t.end_time,t.end_time
        endTime,t.state,t.person_tel,t.person_tel personTel,t.community_id,t.community_id communityId,t.energy,t.duration_price durationPrice,
        cm.machine_name machineName,cm.machine_code machineCode,cm.duration_price durationPrice,
        cm.machine_name machineName,cm.machine_code machineCode,
        cmp.port_code portCode,cmp.port_name portName,td.`name` stateName,SUM(cmoa.amount) amount
        from charge_machine_order t
        left join charge_machine cm on t.machine_id = cm.machine_id and cm.status_cd = '0'
@@ -68,6 +68,10 @@
        <if test="endTime !=null and endTime != ''">
            and t.end_time= #{endTime}
        </if>
        <if test="queryTime !=null and queryTime != ''">
            and t.start_time &lt; #{queryTime}
            and t.end_time &gt; #{queryTime}
        </if>
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
@@ -82,7 +86,7 @@
        </if>
        GROUP BY t.order_id,t.remark,t.port_id,t.person_name,t.machine_id,t.acct_detail_id,t.person_id,
        t.charge_hours,t.start_time,t.end_time,t.state,t.person_tel,t.community_id,t.energy,t.duration_price,
        cm.machine_name ,cm.machine_code ,cm.duration_price ,
        cm.machine_name ,cm.machine_code  ,
        cmp.port_code ,cmp.port_name ,td.`name`
        order by t.create_time desc
        <if test="page != -1 and page != null ">