From dc045ab63dbf7aba77bcbe0ceea2322ac0f623b7 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Mon, 21 Feb 2022 14:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/log/controller/OrderLogController.java   | 7 ++++++-
 .../java/com/xhpc/log/controller/PileLogController.java    | 5 ++++-
 .../src/main/resources/mapper/XhpcChargingPileMapper.xml   | 5 ++++-
 .../src/main/resources/mapper/XhpcHistoryOrderMapper.xml   | 3 +++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java
index 5050d522..fd78ded5 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java
+++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java
@@ -25,11 +25,16 @@ public class OrderLogController extends BaseController {
     OrderLogService orderLogService;
 
     @GetMapping("/getPage")
-    public TableDataInfo getOrderPage(@RequestParam(required = false) String tenantId,
+    public TableDataInfo getOrderPage(
+            @RequestParam(required = false) String orderId,
+            @RequestParam(required = false) String phone,
+            @RequestParam(required = false) String tenantId,
                 @RequestParam(required = false) Integer number){
 
         startPage();
         Map<String, Object> params = new HashMap<>();
+        params.put("orderId", orderId);
+        params.put("phone", phone);
         params.put("operatorId", SecurityUtils.getUserId());
         params.put("number", number);
         params.put("tenantId", tenantId);
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java
index 62c8da67..cfd96e3b 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java
+++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java
@@ -26,11 +26,14 @@ public class PileLogController extends BaseController {
 
 
     @GetMapping("/getPage")
-    public TableDataInfo getPilePage(@RequestParam(required = false) String tenantId,
+    public TableDataInfo getPilePage(
+            @RequestParam(required = false) String stationName,
+            @RequestParam(required = false) String tenantId,
                                      @RequestParam(required = false) Integer number) {
         startPage();
 
         Map<String, Object> params = new HashMap<>();
+        params.put("stationName", stationName);
         params.put("operatorId", SecurityUtils.getUserId());
         params.put("number", number);
         params.put("tenantId", tenantId);
diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml
index ae681be0..90fb4f68 100644
--- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml
+++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml
@@ -98,6 +98,9 @@
 <!--        <if test="chargingStationId !=null and chargingStationId!=''">-->
 <!--            and cp.charging_station_id=#{chargingStationId}-->
 <!--        </if>-->
+          <if test="params.stationName!=null and params.stationName!=''">
+              and st.name like CONCAT('%',#{params.stationName},'%')
+          </if>
         <if test="params.number !=0 and params.number ==1">
             and cp.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId})
         </if>
@@ -107,7 +110,7 @@
         <if test="params.tenantId != null and params.tenantId != ''">
             and cp.tenant_id = #{params.tenantId}
         </if>
-        order by cp.create_time desc
+        order by cp.charging_station_id, cp.charging_pile_id
     </select>
 
     <insert id="addXhpcChargingPile" parameterType="com.xhpc.common.domain.XhpcChargingPile" useGeneratedKeys="true"
diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
index 13134066..8d53e278 100644
--- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
@@ -15,6 +15,9 @@
         from xhpc_charge_order as co
         left join xhpc_charging_station as st on st.charging_station_id =co.charging_station_id
         where co.del_flag =0
+        <if test="params.orderId!=null and params.orderId!=''">
+            and co.serial_number like concat('%', #{params.orderId},'%')
+        </if>
         <if test="params.number !=0 and params.number ==1">
             and co.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId})
         </if>