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/ECRController.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ECRController.java b/src/main/java/com/whyc/controller/ECRController.java
index e688f28..4c21d68 100644
--- a/src/main/java/com/whyc/controller/ECRController.java
+++ b/src/main/java/com/whyc/controller/ECRController.java
@@ -11,9 +11,11 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.ParseException;
import java.util.Date;
+import java.util.List;
/**
* 璁� 璁� 宸� 绋� 鍙� 鏇� 鐢� 璇� 璋� 鏌� 琛�(ECR)
@@ -48,7 +50,9 @@
@ApiOperation("鍒嗛〉鏌ヨECR璁板綍")
@GetMapping("searchEcr")
- public Response searchEcr(@RequestParam int number, @RequestParam String subCode, @RequestParam String subModel,
+ public Response searchEcr(@RequestParam(required = false) String number,
+ @RequestParam(required = false) String subCode,
+ @RequestParam(required = false) String subModel,
@RequestParam String createTime, @RequestParam String createTime1,
@RequestParam int pageCurr, @RequestParam int pageSize){
Date testTime1= null;
@@ -59,6 +63,25 @@
} catch (ParseException e) {
e.printStackTrace();
}
- return service.ecrImport(number,subCode,subModel,testTime1,testTime2,pageCurr,pageSize);
+ return service.searchEcr(number,subCode,subModel,testTime1,testTime2,pageCurr,pageSize);
}
+
+ @ApiOperation("瀵煎嚭璁板綍")
+ @GetMapping("exportExcel")
+ public void exportExcel(HttpServletResponse response,@RequestParam(required = false) List<Integer> ids){
+ service.exportExcel(response,ids);
+ }
+
+ @ApiOperation("鍒犻櫎ECR璁板綍")
+ @GetMapping("deleteEcr")
+ public Response deleteEcr( @RequestParam String number,
+ @RequestParam(required = false) String filePath){
+ return service.deleteEcr(number,filePath);
+ }
+ @ApiOperation("鍙嶉涓嬫媺鏌ヨECR璁板綍")
+ @GetMapping("searchEcrInFeedback")
+ public Response searchEcrInFeedback(){
+ return service.searchEcrInFeedback();
+ }
+
}
--
Gitblit v1.9.1