机床修改，增加文件对比

yangys

2025-08-28 8e60278048df6d44a81ca8626cac63e5deab2761

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

@@ -10,6 +10,8 @@
        <result column="update_time" property="updateTime"/>
        <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
        from mdm_machine_file f join mdm_machine m on f.machine_code=m.code and m.is_deleted=0
@@ -25,7 +27,21 @@
                or f.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
                )
            </if>

            <if test="query.machineCode!=null and query.machineCode!=''">
                and   m.code= #{query.machineCode,jdbcType=VARCHAR}
            </if>
            <if test="query.deptIds!=null and query.deptIds.size()&gt;0">
                and  m.owner_dept in
                <foreach item="item" collection="query.deptIds" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
            <if test="query.dirType!=null and query.dirType!=''">
                and  f.dir_type= #{query.dirType,jdbcType=VARCHAR}
            </if>
        </where>
        order by f.file_create_time desc
    </select>
    <select id="handlePageQuery" 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,f.determine_time
@@ -39,8 +55,34 @@
            <if test="query.confirmTimeEnd!=null">
                and f.determine_time&lt;=#{query.confirmTimeEnd}
            </if>
            order by f.file_create_time desc
        </where>
    </select>

    <!--工控网首页文件查询-->
    <select id="pageQuery" resultType="org.springblade.mdm.gkw.programnode.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>
            f.is_deleted=0

            <if test="query.name!=null and query.name!=''">
                and f.name like CONCAT('%', #{query.name,jdbcType=VARCHAR},'%')
            </if>

            <if test="query.machineCode!=null and query.machineCode!=''">
                and   f.machine_code= #{query.machineCode,jdbcType=VARCHAR}
            </if>
            <if test="query.deptIds!=null and query.deptIds.size()&gt;0">
                and  m.owner_dept in
                <foreach item="item" collection="query.deptIds" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
            <if test="query.dirType!=null and query.dirType!=''">
                and  f.dir_type= #{query.dirType,jdbcType=VARCHAR}
            </if>
        </where>
        order by f.file_create_time desc
    </select>
</mapper>