From 4988082dcafba6a928aab186ae18a8da3e16795e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 18 八月 2025 12:00:55 +0800
Subject: [PATCH] 替换流程发起，增加文件校验
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 2543dbd..1e76ba2 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,11 +13,9 @@
<!--DNC鍥炰紶绋嬪簭澶勭悊鍒嗛〉-->
<select id="pageQuery" resultType="org.springblade.mdm.program.vo.DncBackFileVO">
- select f.id,n.name name,f.create_time,m.code machine_code, m.name machine_name,f.create_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_approved a on f.approved_id=a.id
- join mdm_nc_node n on a.nc_node_id=n.id
+ join mdm_nc_node n on f.nc_node_id=n.id
left join mdm_machine m on n.machine_code=m.code
<where>
@@ -27,14 +25,14 @@
</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},'%')
+ or n.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
)
</if>
<if test="query.createTimeBegin!=null">
- and a.create_time >= #{query.createTimeBegin}
+ and f.create_time >= #{query.createTimeBegin}
</if>
<if test="query.createTimeEnd!=null">
- and a.create_time <= #{query.createTimeEnd}
+ and f.create_time <= #{query.createTimeEnd}
</if>
</where>
</select>
--
Gitblit v1.9.3