From 31ccc9cd47f96cea6e4e13b078187fd3201c4666 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 04 九月 2026 16:35:24 +0800
Subject: [PATCH] feat(report): 更新检测报告模板并优化报告生成功能 - 优化设备信息展示格式，支持多设备列表显示 - 统一检测报告和检验报告使用新版模板格式
---
cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml b/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
index 79d1849..b6ab4cc 100644
--- a/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
@@ -3,15 +3,18 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceMapper">
- <select id="getDeviceMaintenanceParam" resultType="com.ruoyi.device.pojo.DeviceMaintenance">
- select id,device_id,device_name, device_number,management_number,content,name
- ,date from device_maintenance
- </select>
-
- <select id="deviceMaintenanceExport" resultType="com.ruoyi.device.excel.DeviceMaintenanceExport">
- select id, device_id, device_name, device_number, management_number, content, date, if(maintenance_type = 1, '璁″垝涓淮鎶�', '浣跨敤鍓嶅悗缁存姢'), next_date, name, comments
- from device_maintenance dm
- where dm.device_id = #{deviceId}
+ <!-- 璁惧缁存姢鍒嗛〉鏌ヨ -->
+ <select id="selectDeviceMaintenancePage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
+ select * from (
+ select db.*,
+ d.device_name,
+ d.management_number
+ from device_maintenance db
+ left join device d on db.device_id = d.id)a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ order by maintenance_date desc
</select>
</mapper>
--
Gitblit v1.9.3