From c345de671dfd4f94217b032dfa433e1592cb6606 Mon Sep 17 00:00:00 2001
From: wenhui <1455474577@qq.com>
Date: Thu, 10 Mar 2022 10:38:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/XhpcDownCodeMapper.xml    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcDownCodeMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcDownCodeMapper.xml
index 4b9a24c9..863ab47b 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcDownCodeMapper.xml
+++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcDownCodeMapper.xml
@@ -46,27 +46,26 @@
           AND p.del_flag = 0
           AND t.del_flag = 0
 
+
     </select>
 
     <select id="selectExcelDataByStationId" resultType="map">
 
-        SELECT terminal.NAME          AS tName,
-               station.NAME           AS sName,
-               terminal.serial_number AS tSN,
-               pile.serial_number     AS psn,
+        SELECT terminal.NAME                                                 AS tName,
+               station.NAME                                                  AS sName,
+               terminal.serial_number                                        AS tSN,
+               pile.serial_number                                            AS psn,
                pile.type,
                pile.power,
-               concat(
-                       'https://www.scxhua.cn?pNum=',
-                       terminal.serial_number
-                   )                  AS qrContent
+               concat('https://www.scxhua.cn?pNum=', terminal.serial_number) AS qrContent
         FROM xhpc_img AS img
                  INNER JOIN xhpc_terminal AS terminal ON img.terminal_id = terminal.terminal_id
                  INNER JOIN xhpc_charging_pile AS pile ON pile.charging_pile_id = terminal.charging_pile_id
                  INNER JOIN xhpc_charging_station AS station ON station.charging_station_id = pile.charging_station_id
-        WHERE station.charging_station_id = #{stationId}
+        WHERE station.charging_station_id = 1
           AND terminal.del_flag = 0
           AND pile.del_flag = 0
+          AND img.del_flag = 0
 
     </select>
 
@@ -82,6 +81,7 @@
             WHERE charging_pile_id = #{pileId}
         )
           AND t.del_flag = 0
+          AND i.del_flag = 0
 
     </select>