ecr

lxw

2023-02-21 838d29fcb6f6e521e0abacf8dd2e6ed9dc5c8f7e

 src/main/java/com/whyc/controller/SoftwareController.java

@@ -42,9 +42,9 @@

    @ApiOperation("软件上传")
    @PostMapping("upload")
    public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr) throws IOException {
    public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String fontUpdateTime,@RequestParam String softwareStr) throws IOException {
        List<Software> softwareList = ActionUtil.getGson().fromJson(softwareStr,new TypeToken<List<Software>>(){}.getType());
        return service.upload(file1,file2,softwareList);
        return service.upload(file1,file2,fontUpdateTime,softwareList);
    }

    @ApiOperation("更新软件版本对应的适用机型")
@@ -60,8 +60,9 @@
                                   @RequestParam(required = false) String applyMaterialCode,
                                   @RequestParam(required = false) String applyModel,
                                   @RequestParam(required = false) String owner,
                                   @RequestParam(required = false) String boardNumber,
                                   @RequestParam int pageCurr,@RequestParam int pageSize ){
        return service.getAllSoftware(fileName,applyMaterialCode,applyModel,owner,pageCurr,pageSize);
        return service.getAllSoftware(fileName,applyMaterialCode,applyModel,owner,boardNumber,pageCurr,pageSize);
    }

    @ApiOperation(value = "根据subcode查询软件列表")