From f14c50cb0036d3ddd655ce4e34732ba396a836c4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:42:03 +0800
Subject: [PATCH] optimize 统计

---
 java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml
index 587c6bc..639cf6f 100644
--- a/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml
@@ -8,9 +8,11 @@
     <!-- 淇濆瓨鍏呯數妗╄鍗曚俊鎭� 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>
 
@@ -21,8 +23,8 @@
         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,
-        cm.machine_name machineName,cm.machine_code machineCode,cm.duration_price durationPrice,
+        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'
@@ -66,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>
@@ -79,8 +85,8 @@
             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,
-        cm.machine_name ,cm.machine_code ,cm.duration_price ,
+        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 ">
@@ -132,6 +138,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