From 10c3d3300cce0ccef45b9db8865b61999385158b Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 23 六月 2025 21:53:42 +0800
Subject: [PATCH] 验收报告查询修改
---
src/main/java/com/whyc/controller/SoftwareController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/controller/SoftwareController.java b/src/main/java/com/whyc/controller/SoftwareController.java
index 20b0777..d38d2d3 100644
--- a/src/main/java/com/whyc/controller/SoftwareController.java
+++ b/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("鏇存柊杞欢鐗堟湰瀵瑰簲鐨勯�傜敤鏈哄瀷")
@@ -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