From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改

---
 src/main/java/com/whyc/controller/SoftwareController.java |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/controller/SoftwareController.java b/src/main/java/com/whyc/controller/SoftwareController.java
index 462c62f..d38d2d3 100644
--- a/src/main/java/com/whyc/controller/SoftwareController.java
+++ b/src/main/java/com/whyc/controller/SoftwareController.java
@@ -54,15 +54,25 @@
         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(required = false) String version,
                                    @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,version,pageCurr,pageSize);
     }
 
     @ApiOperation(value = "鏍规嵁subcode鏌ヨ杞欢鍒楄〃")
@@ -79,7 +89,13 @@
 
     @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);
+    }
+
+    @ApiOperation(value = "鏍规嵁杞欢杞欢鍚嶅疄鐜拌蒋浠跺垹闄�")
+    @GetMapping("deleteSoftware")
+    public Response deleteSoftware( @RequestParam String fileName,@RequestParam String version){
+        return service.deleteSoftware(fileName,version);
     }
 }

--
Gitblit v1.9.1