lxw
2022-09-09 04b38e5512e0e2995f066766c1de3fdbca98f807
src/main/java/com/whyc/controller/SoftwareController.java
@@ -35,8 +35,7 @@
        if(!name.substring(name.length()-4).equals(".xls") && !name.substring(name.length()-5).equals(".xlsx")){
            response.set(1,false,"文件解析错误:上传格式非excel格式");
        }else{
            List<Software> list = service.excelParse(multipartFile.getInputStream());
            response.setII(1,true,list,"文件解析成功");
            response =  service.excelParse(multipartFile.getInputStream());
        }
        return response;
    }
@@ -50,8 +49,12 @@
    @ApiOperation(value = "查询软件列表的信息")
    @GetMapping("getAllSoftware")
    public Response getAllSoftware(@RequestParam(required = false) String fileName,@RequestParam int pageCurr,@RequestParam int pageSize ){
        return service.getAllSoftware(fileName,pageCurr,pageSize);
    public Response getAllSoftware(@RequestParam(required = false) String fileName,
                                   @RequestParam(required = false) String applyMaterialCode,
                                   @RequestParam(required = false) String applyModel,
                                   @RequestParam(required = false) String owner,
                                   @RequestParam int pageCurr,@RequestParam int pageSize ){
        return service.getAllSoftware(fileName,applyMaterialCode,applyModel,owner,pageCurr,pageSize);
    }
    @ApiOperation(value = "根据subcode查询软件列表")