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-process/src/main/resources/mapper/ProcessReportMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
index 340e06c..62e82d0 100644
--- a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
@@ -18,7 +18,7 @@
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
</resultMap>
- <select id="pageProcessReport" resultType="com.ruoyi.process.pojo.ProcessReport">
+ <select id="pageProcessReport" resultType="com.ruoyi.process.dto.ProcessReportDto">
select * from (select cpr.* ,
u1.name sendUserName
from cnas_process_report cpr
@@ -27,10 +27,10 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="exportProcessReport" resultType="com.ruoyi.process.pojo.ProcessReport">
+ <select id="exportProcessReport" resultType="com.ruoyi.process.dto.ProcessReportDto">
select ROW_NUMBER() OVER (ORDER BY cpr.id) AS indexs,
cpr.* ,
- u1.name sendUserName
+ u1.signature_url sendUserUrl
from cnas_process_report cpr
left join user u1 on send_user=u1.id
</select>
--
Gitblit v1.9.3