From 558ffb85c9548c25023623b3458e2e0d8406bc7c Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 01 三月 2023 11:56:11 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/controller/ECRController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ECRController.java b/src/main/java/com/whyc/controller/ECRController.java
index 761ea03..3fd1368 100644
--- a/src/main/java/com/whyc/controller/ECRController.java
+++ b/src/main/java/com/whyc/controller/ECRController.java
@@ -15,6 +15,7 @@
import java.io.IOException;
import java.text.ParseException;
import java.util.Date;
+import java.util.List;
/**
* 璁� 璁� 宸� 绋� 鍙� 鏇� 鐢� 璇� 璋� 鏌� 琛�(ECR)
@@ -65,10 +66,10 @@
return service.searchEcr(number,subCode,subModel,testTime1,testTime2,pageCurr,pageSize);
}
- @ApiOperation("瀵煎嚭鎵�鏈夎褰�")
+ @ApiOperation("瀵煎嚭璁板綍")
@GetMapping("exportExcel")
- public void exportExcel(HttpServletResponse response){
- service.exportExcel(response);
+ public void exportExcel(HttpServletResponse response,@RequestParam(required = false) List<Integer> ids){
+ service.exportExcel(response,ids);
}
@ApiOperation("鍒犻櫎ECR璁板綍")
--
Gitblit v1.9.1