From f8913a0b4dd441c74c3dd82306a65708a4b1597e Mon Sep 17 00:00:00 2001
From: yinrw <2030349650@qq.com>
Date: 星期五, 24 七月 2026 15:25:46 +0800
Subject: [PATCH] 修改多个模块页面展示逻辑

---
 src/main/resources/mapper/device/DeviceRepairMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 8969d0c..8578e7c 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -14,7 +14,6 @@
                 dr.maintenance_name,
                 dr.maintenance_time,
                 dr.maintenance_result,
-                dr.maintenance_price,
                 dr.status,
                 dr.create_time,
                 dr.update_time,
@@ -22,7 +21,8 @@
                 dr.update_user,
                dr.tenant_id,
                dl.device_name,
-               dl.device_model
+               dl.device_model,
+               dr.machinery_category
         from device_repair dr
         left join device_ledger dl on dr.device_ledger_id = dl.id
         <where>
@@ -50,6 +50,7 @@
                 and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
             </if>
         </where>
+        order by dr.repair_time desc
     </select>
     <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
         select dr.id,
@@ -60,7 +61,6 @@
                dr.maintenance_name,
                dr.maintenance_time,
                dr.maintenance_result,
-               dr.maintenance_price,
                dr.status,
                dr.create_time,
                dr.update_time,
@@ -68,6 +68,7 @@
                dr.update_user,
                dr.tenant_id,
                dl.device_name,
+               dr.machinery_category,
                dl.device_model
         from device_repair dr
                  left join device_ledger dl on dr.device_ledger_id = dl.id

--
Gitblit v1.9.3