From b0d0191a88912b352385349461b500a4964d693b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 22:51:24 +0800
Subject: [PATCH] 机床加字段
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/mapper/MachineAcceptedFileMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/mapper/MachineAcceptedFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/mapper/MachineAcceptedFileMapper.xml
index 473882e..87328ba 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/mapper/MachineAcceptedFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/mapper/MachineAcceptedFileMapper.xml
@@ -22,13 +22,19 @@
-->
<!--鏈哄簥鍥炰紶绋嬪簭澶勭悊鍒嗛〉-->
<select id="handlePageQuery" resultType="org.springblade.mdm.machinefile.vo.MachineAcceptedFileVO">
- select f.id,mf.name,f.create_time,m.code machine_code, m.name machine_name,f.create_time,mf.program_status,mf.file_create_time
+ select f.id,f.name,f.create_time,m.code machine_code, m.name machine_name,f.create_time,mf.program_status,mf.file_create_time,f.export_time,f.create_time
from mdm_machine_accepted_file f
left join mdm_machine_file mf on f.machine_file_id=mf.id
left join mdm_machine m on mf.machine_code=m.code
<where>
- f.status=1 and f.is_deleted=0
-
+ f.status=#{query.status} and f.is_deleted=0
+ <if test="query.status!=null and query.status!=''">
+ and f.status like #{query.status}
+ </if>
+ <if test="query.name!=null and query.name!=''">
+ <bind name="fname" value="'%'+query.name+'%'"/>
+ and f.name like #{fname}
+ </if>
<if test="query.confirmTimeBegin!=null">
and m.confirm_time$gt;=#{query.confirmTimeBegin}
</if>
--
Gitblit v1.9.3