重构机床回传文件；撤回后禁用撤回按钮

yangys

2025-08-30 86c8efdb19a2f4be79a947650ef62ed79382011b

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/mapper/MachineFileMapper.xml

ÎļþÃû´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/mapper/MachineFileMapper.xml ÐÞ¸Ä
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.mdm.gkw.programnode.mapper.MachineFileMapper">
    <resultMap id="BaseResultMap" type="org.springblade.mdm.gkw.programnode.entity.MachineFile">
<mapper namespace="org.springblade.mdm.machinefile.mapper.MachineFileMapper">
    <resultMap id="BaseResultMap" type="org.springblade.mdm.machinefile.entity.MachineFile">
        <id column="id" property="id"/>
        <result column="name" property="name"/>
        <result column="node_type" property="dirType"/>
@@ -11,12 +11,12 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>

    <!--机床回传文件分页查询-->
    <select id="machineBackFilePageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
        select f.id,f.name,f.machine_code,f.file_create_time arrived_time,f.md5,f.file_size
    <!--待接收机床文件分页查询-->
    <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
        from mdm_machine_file f join mdm_machine m on f.machine_code=m.code and m.is_deleted=0
        <where>
            f.dir_type='TEMP' and f.status=1 and f.is_deleted=0
            f.status=1 and f.is_deleted=0

            <if test="query.machineSpec!=null and query.machineSpec!=''">
                and m.machine_spec=#{query.machineSpec,jdbcType=VARCHAR}
@@ -40,10 +40,14 @@
            <if test="query.dirType!=null and query.dirType!=''">
                and  f.dir_type= #{query.dirType,jdbcType=VARCHAR}
            </if>
            <if test="query.dirType==null or query.dirType==''">
                and f.dir_type='TEMP'
            </if>
        </where>
        order by f.file_create_time desc
    </select>
    <select id="handlePageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
    <!--
    <select id="handlePageQuery" resultType="org.springblade.mdm.machinefile.vo.MachineAcceptedFileVO">
        select f.id,f.name,f.machine_code,f.file_create_time arrived_time,f.md5,f.file_size,f.determine_time
        from mdm_machine_file f join mdm_machine m on f.machine_code=m.code and m.is_deleted=0
        <where>
@@ -58,9 +62,9 @@
            order by f.file_create_time desc
        </where>
    </select>

    -->
    <!--工控网首页文件查询-->
    <select id="pageQuery" resultType="org.springblade.mdm.gkw.programnode.entity.MachineFile">
    <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
        from mdm_machine_file f join mdm_machine m on f.machine_code=m.code and m.is_deleted=0
        <where>