From 0bdfd76339bb58be09927b8c2fe268175c3a7cc8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 10:11:33 +0800
Subject: [PATCH] 优化现场编制导出
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 c74b4e0..4dd637e 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
@@ -10,20 +10,39 @@
<result column="update_time" property="updateTime"/>
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <!--瀵煎嚭宸ユ帶缃戝垎椤垫煡璇�-->
<select id="exportDncPageQuery" resultType="org.springblade.mdm.program.vo.NcProgramExportDncPageVO">
- select a.id,a.nc_program_id,p.name,p.nc_node_id,p.part_no,p.part_no_edition,p.process_name,a.create_time from mdm_nc_program_approved a inner join mdm_nc_program p on a.nc_program_id=p.id
- where a.is_deleted=0
+ 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_his n on a.nc_node_id=n.id
+ left join blade_user u on a.update_user=u.id
+
<where>
+ a.is_deleted=0 and a.status=#{query.status}
<if test="query.name!=null and query.name!=''">
- and p.name like CONCAT('%', #{query.name,jdbcType=VARCHAR},'%')
+ and n.name like CONCAT('%', #{query.name,jdbcType=VARCHAR},'%')
</if>
- <if test="query.passTimeBegin!=null">
- and a.create_time >= #{query.passTimeBegin}
+ <if test="query.createTimeBegin!=null">
+ and a.create_time >= #{query.createTimeBegin}
</if>
- <if test="query.passTimeEnd!=null">
- and a.create_time <= #{query.passTimeEnd}
+ <if test="query.createTimeEnd!=null">
+ and a.create_time <= #{query.createTimeEnd}
+ </if>
+ <if test="query.queryType == 'self'">
+ and a.programmer_id = #{query.userId}
+ </if>
+ <if test="query.queryType=='group'">
+ and a.programmer_id IN
+ (
+ select id from blade_user where
+ <foreach collection="query.userDeptIds" item="deptId" open="(" separator="or" close=")" >
+ dept_id like #{deptId}
+ </foreach>
+ )
+
</if>
</where>
+ order by a.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3