From 703b2f19af6b1d65adc3bc515b9df9efebacbd8b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 10 四月 2023 13:04:25 +0800
Subject: [PATCH] optimize owner updata log
---
java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml
index 548ab48..95edb80 100644
--- a/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml
@@ -8,21 +8,29 @@
<!-- 淇濆瓨鍏呯數妗╄鍗曚俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveChargeMachineOrderInfo" parameterType="Map">
insert into charge_machine_order(
- amount,order_id,remark,port_id,person_name,machine_id,acct_detail_id,person_id,charge_hours,start_time,end_time,state,person_tel,community_id,energy
+ amount,order_id,remark,port_id,person_name,machine_id,acct_detail_id,person_id,charge_hours,
+ start_time,end_time,state,person_tel,community_id,energy,duration_price
) values (
- #{amount},#{orderId},#{remark},#{portId},#{personName},#{machineId},#{acctDetailId},#{personId},#{chargeHours},#{startTime},#{endTime},#{state},#{personTel},#{communityId},#{energy}
+ #{amount},#{orderId},#{remark},#{portId},#{personName},#{machineId},#{acctDetailId},#{personId},#{chargeHours},
+ #{startTime},#{endTime},#{state},#{personTel},#{communityId},#{energy},#{durationPrice}
)
</insert>
<!-- 鏌ヨ鍏呯數妗╄鍗曚俊鎭� add by wuxw 2018-07-03 -->
<select id="getChargeMachineOrderInfo" parameterType="Map" resultType="Map">
- select t.amount,t.order_id,t.order_id orderId,t.remark,t.status_cd,t.status_cd statusCd,t.port_id,t.port_id
+ select t.order_id,t.order_id orderId,t.remark,t.port_id,t.port_id
portId,t.person_name,t.person_name personName,t.machine_id,t.machine_id
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
+ 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,
+ 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'
+ left join charge_machine_port cmp on t.port_id = cmp.port_id and cmp.status_cd = '0'
+ left join t_dict td on td.status_cd = t.state and td.table_name = 'charge_machine_order' and td.table_columns = 'state'
+ left join charge_machine_order_acct cmoa on t.order_id = cmoa.order_id and cmoa.status_cd = '0'
where 1 =1
<if test="amount !=null and amount != ''">
and t.amount= #{amount}
@@ -72,6 +80,10 @@
<if test="energy !=null and energy != ''">
and t.energy= #{energy}
</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 ,
+ cmp.port_code ,cmp.port_name ,td.`name`
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -122,6 +134,9 @@
<if test="energy !=null and energy != ''">
, t.energy= #{energy}
</if>
+ <if test="durationPrice !=null and durationPrice != ''">
+ , t.duration_price= #{durationPrice}
+ </if>
where 1=1
<if test="orderId !=null and orderId != ''">
and t.order_id= #{orderId}
--
Gitblit v1.8.0