From 95e63522959ff8c21381ee2a5dc85b9d44cf2949 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 22:34:00 +0800
Subject: [PATCH] 补充流程fix
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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..222be64 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,22 +13,27 @@
<!--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,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
+ join mdm_nc_node n on f.nc_node_id=n.id
+ left join mdm_machine m on n.machine_code=m.code
- <if test="query.machineSpec!=null and query.machineSpec!=''">
- and m.machine_spec=#{query.machineSpec,jdbcType=VARCHAR}
- </if>
+ <where>
+ f.is_deleted=0
+
<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},'%')
+ or n.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
)
</if>
+ <if test="query.createTimeBegin!=null">
+ and f.create_time >= #{query.createTimeBegin}
+ </if>
+ <if test="query.createTimeEnd!=null">
+ and f.create_time <= #{query.createTimeEnd}
+ </if>
</where>
+ order by f.id desc
</select>
--
Gitblit v1.9.3