修复机床回传文件分页

yangys

2025-06-16 22d0e9a68cd2f8a129742618e54d66cba7d7114f

修复机床回传文件分页

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml

@@ -18,7 +18,7 @@
        from mdm_machine m join blade_dict_biz g on m.machine_group_code=g.dict_key and g.code='machine_group' and g.is_deleted=0
        where m.is_deleted=0
        <if test="query.machineGroupCode!=null and query.machineGroupCode!=''">
            and m.machineGroupCode=#{query.keyword,jdbcType=VARCHAR}
            and m.machine_group_code=#{query.machineGroupCode,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},'%'))

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.java

@@ -11,6 +11,6 @@

public interface MachineBackFileMapper extends BladeMapper<MachineBackFile> {

    IPage<MachineBackFileVO> pageQuery(IPage<MachineBackFile> page, @Param("queryVO")MachineBackFileQueryVO queryVO);
    IPage<MachineBackFileVO> pageQuery(IPage<MachineBackFile> page, @Param("query")MachineBackFileQueryVO queryVO);
    //pageMachine
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml

@@ -14,7 +14,14 @@
    <select id="pageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
        select f.id,f.filename,f.create_time,m.code machineCode,m.name machineName
        from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
            ${ew.customSqlSegment}
        <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 f.filename like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
                )
        </if>
    </select>



 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java

@@ -50,29 +50,14 @@

    }




    /**
     * 查询分页
     * @param query 查询参数
     * @return 分页数据
     */
    public IPage<MachineBackFileVO> pageQuery(MachineBackFileQueryVO query) {

        //LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();

        IPage<MachineBackFileVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);

        //MachineSpec.valueOf()
        /*
        for (MachineVO record : page.getRecords()) {
            if(record.getMachineSpec() != null){
                MachineSpec spec = MachineSpec.valueOf(record.getMachineSpec());
                record.setMachineSpecName(spec.getText());
            }

        }*/
        return page;
    }
}