From 046e7e3c76ab6690d5e81566de31868257288df3 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 16 十月 2025 16:54:54 +0800
Subject: [PATCH] 任务导入+翻页修复

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/mapper/MachineFileMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/mapper/MachineFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/mapper/MachineFileMapper.xml
index f1a9b35..ea61069 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/mapper/MachineFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/mapper/MachineFileMapper.xml
@@ -11,6 +11,12 @@
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
 
+    <!--鍒犻櫎娌℃湁寮曠敤鐨勶紝涓旀爣璁颁负鍒犻櫎鐨勬枃浠惰褰�-->
+    <delete id="deleteNotUseRecords">
+        delete from mdm_machine_file_change_his where machine_file_id in (select id mdm_machine_file where id not in (select machine_file_id from mdm_machine_accepted_file) and status=4);
+        delete from mdm_machine_file where id not in (select machine_file_id from mdm_machine_accepted_file) and status=4;
+    </delete>
+
     <!--寰呮帴鏀舵満搴婃枃浠跺垎椤垫煡璇�-->
     <select id="filePageForAccept" resultType="org.springblade.mdm.machinefile.entity.MachineFile">
         select f.id,f.name,f.machine_code,f.file_create_time,f.md5,f.file_size,f.dir_type,f.program_status
@@ -65,7 +71,7 @@
     -->
     <!--宸ユ帶缃戦椤垫枃浠舵煡璇�-->
     <select id="pageQuery" resultType="org.springblade.mdm.machinefile.entity.MachineFile">
-        select f.id,f.name,f.machine_code,f.file_create_time, f.file_modify_time,f.md5,f.file_size,f.create_time,f.update_time
+        select f.id,f.name,f.machine_code,f.dir_type,f.file_create_time, f.file_modify_time,f.md5,f.oss_name,f.file_size,f.create_time,f.update_time
         from mdm_machine_file f join mdm_machine m on f.machine_code=m.code and m.is_deleted=0
         <where>
             f.is_deleted=0 and f.status &lt;&gt; 4
@@ -95,7 +101,7 @@
         select f.id,f.name,f.machine_code,f.file_create_time, f.file_modify_time,f.md5,f.file_size,f.exception_type,f.create_time,f.update_time
         from mdm_machine_file f join mdm_machine m on f.machine_code=m.code and m.is_deleted=0
         <where>
-            f.dir_type='REC' and f.is_deleted=0 and f.exception_type is not null and f.exception_type &lt;&gt; 0
+            f.status &lt;&gt; 4 and f.dir_type='REC' and f.is_deleted=0 and f.exception_type is not null and f.exception_type &lt;&gt; 0
 
             <if test="query.name!=null and query.name!=''">
                 and f.name like CONCAT('%', #{query.name,jdbcType=VARCHAR},'%')

--
Gitblit v1.9.3