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 |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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..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,21 +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
 
+       <where>
+           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},'%')
+            or n.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
                 )
         </if>
+       <if test="query.createTimeBegin!=null">
+           and f.create_time &gt;= #{query.createTimeBegin}
+       </if>
+       <if test="query.createTimeEnd!=null">
+           and f.create_time &lt;= #{query.createTimeEnd}
+       </if>
       </where>
     </select>
 

--
Gitblit v1.9.3