From c5b91210fc14caaffb6df8a76bf12bc29c753467 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 19 六月 2025 19:12:00 +0800
Subject: [PATCH] 机床回传代码更新
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
index b95dd1d..237080f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
@@ -12,21 +12,39 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="pageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
- select f.id,f.filename,f.create_time,m.code machineCode,m.name machineName
+ select f.id,p.name program_name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
+ left join mdm_nc_program p on f.program_id=p.id
+ <where>
+ f.status=1 and f.is_deleted=0
+
<if test="query.machineSpec!=null and query.machineSpec!=''">
and m.machine_spec=#{query.machineSpec,jdbcType=VARCHAR}
</if>
<if test="query.keyword!=null and query.keyword!=''">
and (m.code like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%') or m.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
- or f.filename like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
+ or p.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
)
</if>
+ </where>
+ </select>
+ <select id="handlePageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
+ select f.id,p.name program_name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
+ from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
+ left join mdm_nc_program p on f.program_id=p.id
+ <where>
+ f.status=2 and f.is_deleted=0
+
+ <if test="query.machineSpec!=null and query.machineSpec!=''">
+ and m.machine_spec=#{query.machineSpec,jdbcType=VARCHAR}
+ </if>
+ <if test="query.keyword!=null and query.keyword!=''">
+ and (m.code like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%') or m.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
+ or p.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
+ )
+ </if>
+ </where>
</select>
-
- <!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
-<!-- select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
-<!-- </select>-->
</mapper>
--
Gitblit v1.9.3