From 7357ac4d4da853e84fe4a4f7ebc53d96fbe21212 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 15:25:15 +0800
Subject: [PATCH] 首页搜索错误修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml | 17 ++++++++++-------
1 files changed, 10 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 b560644..2ed24c4 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,19 +11,22 @@
<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.drawing_no,p.drawing_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 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>
</where>
+ order by a.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3