From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
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