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/ProcessDealMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml b/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
index 282eaa7..037afa8 100644
--- a/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
@@ -24,7 +24,7 @@
         </if>
     </select>
 
-    <select id="selectDeal" resultType="com.ruoyi.process.pojo.ProcessDeal">
+    <select id="selectDeal" resultType="com.ruoyi.process.dto.ProcessDealDto">
         select ROW_NUMBER() OVER (ORDER BY id) AS indexs,
                id,
                sample_name,
@@ -32,7 +32,7 @@
                sample_supplier,
                num,
                deal_method,
-               deal_time
+               DATE_FORMAT(deal_time, '%Y-%m-%d') dealTimeStr
         from cnas_process_deal
         where totaldeal_id = #{id}
     </select>

--
Gitblit v1.9.3