whyclxw
2024-08-17 5214a8a554de5487e73f2adfe5654071061c7030
软件查询加上版本的筛选
4个文件已修改
15 ■■■■ 已修改文件
src/main/java/com/whyc/controller/SoftwareController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/SoftwareMapper.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/SoftwareService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/SoftwareMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/SoftwareController.java
@@ -70,8 +70,9 @@
                                   @RequestParam(required = false) String applyModel,
                                   @RequestParam(required = false) String owner,
                                   @RequestParam(required = false) String boardNumber,
                                   @RequestParam(required = false) String version,
                                   @RequestParam int pageCurr,@RequestParam int pageSize ){
        return service.getAllSoftware(lockFlag,fileName,applyMaterialCode,applyModel,owner,boardNumber,pageCurr,pageSize);
        return service.getAllSoftware(lockFlag,fileName,applyMaterialCode,applyModel,owner,boardNumber,version,pageCurr,pageSize);
    }
    @ApiOperation(value = "根据subcode查询软件列表")
src/main/java/com/whyc/mapper/SoftwareMapper.java
@@ -1,11 +1,13 @@
package com.whyc.mapper;
import com.whyc.pojo.Software;
import lombok.Value;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface SoftwareMapper extends CustomMapper<Software>{
    //查询软件列表的信息
    List getFileUrl(Integer lockFlag, String fileName, String applyMaterialCode, String applyModel, String owner, String boardNumber);
    List getFileUrl(Integer lockFlag, String fileName, String applyMaterialCode, String applyModel, String owner, String boardNumber, String version);
}
src/main/java/com/whyc/service/SoftwareService.java
@@ -134,9 +134,10 @@
    }
    //查询软件列表的信息
    public Response getAllSoftware(Integer lockFlag, String fileName, String applyMaterialCode, String applyModel, String owner, String boardNumber, int pageCurr, int pageSize) {
    public Response getAllSoftware(Integer lockFlag, String fileName, String applyMaterialCode, String applyModel, String owner, String boardNumber
            ,String version, int pageCurr, int pageSize) {
        PageHelper.startPage(pageCurr,pageSize);
        List list=mapper.getFileUrl(lockFlag,fileName,applyMaterialCode,applyModel,owner,boardNumber);
        List list=mapper.getFileUrl(lockFlag,fileName,applyMaterialCode,applyModel,owner,boardNumber,version);
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list.size()>0,pageInfo,"软件信息返回");
    }
src/main/resources/mapper/SoftwareMapper.xml
@@ -38,6 +38,9 @@
            <if test="boardNumber!=null&amp;&amp;boardNumber!=''">
                and board_number like '%${boardNumber}%'
            </if>
            <if test="version!=null&amp;&amp;version!=''">
                and version = #{version}
            </if>
        </where>
        order by font_update_time desc
    </select>