From e3ffd75c3e1ae659b3b803d211166ba14bda4548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 04 六月 2026 17:18:53 +0800
Subject: [PATCH] feat(report): 报表图表管理 1.报表管理（样品进度报表，检测项目数据，样品领样记录，设备使用记录） 2.数字化语音看板 3.智能图表
---
cnas-process/src/main/resources/mapper/ProcessReportMapper.xml | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
index 6c06783..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,15 +27,11 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="getIds" resultType="com.ruoyi.process.pojo.ProcessReport">
- select cpr.* ,
- u1.name sendUserName
+ <select id="exportProcessReport" resultType="com.ruoyi.process.dto.ProcessReportDto">
+ select ROW_NUMBER() OVER (ORDER BY cpr.id) AS indexs,
+ cpr.* ,
+ u1.signature_url sendUserUrl
from cnas_process_report cpr
left join user u1 on send_user=u1.id
- where 1=1
- and cpr.id in
- <foreach collection="ids" separator="," item="id" open="(" close=")">
- #{id}
- </foreach>
</select>
</mapper>
--
Gitblit v1.9.3