lxw
2023-09-20 b1d8e8f22b2dc349cb58b98f0022c6594e861284
src/main/java/com/whyc/controller/SoftwareController.java
@@ -54,15 +54,24 @@
        return service.updateApplyModel(multipartFile,softwareList);
    }
    /**
     *lockFlag :
     * 全部 11
     * 可用 0
     * 不可用 12
     * 待测试 -1
     */
    @ApiOperation(value = "查询软件列表的信息")
    @GetMapping("getAllSoftware")
    public Response getAllSoftware(@RequestParam(required = false) String fileName,
    public Response getAllSoftware(
                                   @RequestParam(required = false) Integer lockFlag,
                                   @RequestParam(required = false) String fileName,
                                   @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,boardNumber,pageCurr,pageSize);
        return service.getAllSoftware(lockFlag,fileName,applyMaterialCode,applyModel,owner,boardNumber,pageCurr,pageSize);
    }
    @ApiOperation(value = "根据subcode查询软件列表")
@@ -79,7 +88,7 @@
    @ApiOperation(value = "根据软件id修改软件锁定状态")
    @GetMapping("updateSoftwareLock")
    public Response updateSoftwareLock(@RequestParam String fileUrl,@RequestParam int lockFlag,@RequestParam String localReason){
        return service.updateSoftwareLock(fileUrl,lockFlag,localReason);
    public Response updateSoftwareLock(@RequestParam String fileUrl,@RequestParam int lockFlag,@RequestParam int lockFlagNow,@RequestParam String localReason){
        return service.updateSoftwareLock(fileUrl,lockFlagNow,lockFlag,localReason);
    }
}