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/DeviceExaminePlanDetailsMapper.xml | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
index 2de8c93..9eb714c 100644
--- a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
@@ -6,7 +6,24 @@
<!--璁惧鏍告煡璁″垝璇︽儏鍒楄〃-->
<select id="pageDeviceExaminePlanDetail" resultType="com.ruoyi.device.dto.DeviceExaminePlanDetailsDto">
select * from (
- select d.*,
+ select
+ d.plan_details_id,
+ d.plan_id,
+ d.device_id,
+ d.device_number,
+ d.device_name,
+ d.check_time,
+ d.check_index,
+ d.check_method,
+ d.how_results,
+ d.check_charger_user_id,
+ CASE WHEN d.check_charger_user='' or d.check_charger_user is null THEN u.name
+ ELSE d.check_charger_user END AS check_charger_user,
+ d.remark,
+ d.create_user,
+ d.create_time,
+ d.update_user,
+ d.update_time,
CASE
WHEN dc.review_status = 0 THEN 3
WHEN dc.review_status = 1 THEN 2
@@ -18,6 +35,7 @@
WHEN dd.record_contrast_id IS NOT NULL THEN 1
ELSE 0 END record_contrast_status
from device_examine_plan_details d
+ left join user u on u.id = d.check_charger_user_id
left join device_examine_record dc on d.plan_details_id = dc.plan_details_id
left join device_examine_record_contrast dd on dd.plan_details_id = dc.plan_details_id
order by check_time asc
--
Gitblit v1.9.3