From 685d26c3a34dbb532a2612ce4cd5f9d904c8d6d1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 16:22:08 +0800
Subject: [PATCH] 新增工控网回传历史接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
index e971831..2543dbd 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
@@ -13,13 +13,15 @@
<!--DNC鍥炰紶绋嬪簭澶勭悊鍒嗛〉-->
<select id="pageQuery" resultType="org.springblade.mdm.program.vo.DncBackFileVO">
- select f.id,p.name name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
+ select f.id,n.name name,f.create_time,m.code machine_code, m.name machine_name,f.create_time
from mdm_dnc_back_file f
- left join mdm_nc_program p on f.nc_program_id=p.id
- left join mdm_machine m on p.machine_code=m.code
- <where>
- f.status=1 and f.is_deleted=0
+ left join mdm_nc_program_approved a on f.approved_id=a.id
+ join mdm_nc_node n on a.nc_node_id=n.id
+ left join mdm_machine m on n.machine_code=m.code
+
+ <where>
+ f.is_deleted=0
<if test="query.machineSpec!=null and query.machineSpec!=''">
and m.machine_spec=#{query.machineSpec,jdbcType=VARCHAR}
</if>
@@ -28,6 +30,12 @@
or p.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
)
</if>
+ <if test="query.createTimeBegin!=null">
+ and a.create_time >= #{query.createTimeBegin}
+ </if>
+ <if test="query.createTimeEnd!=null">
+ and a.create_time <= #{query.createTimeEnd}
+ </if>
</where>
</select>
--
Gitblit v1.9.3