From fc3ae614a4c5a2a7cdb9029ecfc4372eb1c28b18 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 09 九月 2025 11:41:42 +0800
Subject: [PATCH] 补充确认表，审批表模板字段
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml
index 2197972..0db07b2 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml
@@ -11,10 +11,12 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="exportDncPageQuery" resultType="org.springblade.mdm.program.vo.NcProgramExportDncPageVO">
- select a.id,n.name,a.nc_node_id,n.drawing_no,n.drawing_no_edition,n.process_name,a.create_time from mdm_nc_program_approved a
+ select a.id,a.title,n.name,a.nc_node_id,n.process_no,n.process_edition,n.drawing_no,n.drawing_no_edition,n.process_name,a.create_time,a.update_time,u.name exporter
+ from mdm_nc_program_approved a
inner join mdm_nc_node n on a.nc_node_id=n.id
+ left join blade_user u on a.update_user=u.id
<where>
- a.is_deleted=0
+ a.is_deleted=0 and a.status=#{query.status}
<if test="query.name!=null and query.name!=''">
and n.name like CONCAT('%', #{query.name,jdbcType=VARCHAR},'%')
</if>
@@ -25,6 +27,9 @@
<if test="query.createTimeEnd!=null">
and a.create_time <= #{query.createTimeEnd}
</if>
+ <if test="query.userId!=null">
+ and a.programmer_id = #{query.userId}
+ </if>
</where>
order by a.create_time desc
</select>
--
Gitblit v1.9.3