From 3aac79e1697af6941a56254725868794b33c19e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=BE=E9=85=92?= <dqwzam0@163.com>
Date: Sun, 29 Dec 2024 18:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BD=BF=E7=94=A8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E7=94=A8=E6=88=B7=E5=85=85=E5=80=BC=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E6=8C=89=E7=85=A7=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=99=8D=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/rechargecard/NgUserRechargeRecordsMapper.xml      | 5 ++++-
 .../mapper/rechargecard/NgWaterPumpUsageRecordsMapper.xml    | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUserRechargeRecordsMapper.xml b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUserRechargeRecordsMapper.xml
index e37e9c2..fe8d2bb 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUserRechargeRecordsMapper.xml
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUserRechargeRecordsMapper.xml
@@ -28,7 +28,8 @@
     </resultMap>
 
     <sql id="selectNgUserRechargeRecordsVo">
-        select id, user_id, user_name, card_number, area_code, type, amount, balance, recharge_time, recharge_code, status, serial_number, remark, create_time, update_time, create_by, update_by, device_number, project_id, dept_id from ng_user_recharge_records
+        select id, user_id, user_name, card_number, area_code, type, amount, balance, recharge_time, recharge_code, status, serial_number, remark, create_time, update_time, create_by, update_by, device_number, project_id, dept_id
+        from ng_user_recharge_records
     </sql>
 
     <select id="selectNgUserRechargeRecordsList" parameterType="NgUserRechargeRecords" resultMap="NgUserRechargeRecordsResult">
@@ -49,6 +50,8 @@
             <if test="projectId != null "> and project_id = #{projectId}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
         </where>
+        <!-- 添加排序 -->
+        order by recharge_time desc
     </select>
 
     <!--<select id="selectNgUserRechargeRecordsByCardNumber" parameterType="String" resultMap="NgUserRechargeRecordsResult">
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgWaterPumpUsageRecordsMapper.xml b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgWaterPumpUsageRecordsMapper.xml
index 3610271..b02857d 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgWaterPumpUsageRecordsMapper.xml
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgWaterPumpUsageRecordsMapper.xml
@@ -24,6 +24,7 @@
             <if test="deviceNumber != null  and deviceNumber != ''"> and device_number = #{deviceNumber}</if>
             <if test="messageContent != null  and messageContent != ''"> and message_content = #{messageContent}</if>
         </where>
+        order by pump_start_time desc
     </select>
 
     <select id="selectNgWaterPumpUsageRecordsById" parameterType="Long" resultMap="NgWaterPumpUsageRecordsResult">