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 | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ECRController.java b/src/main/java/com/whyc/controller/ECRController.java
index 8bc1c46..4c21d68 100644
--- a/src/main/java/com/whyc/controller/ECRController.java
+++ b/src/main/java/com/whyc/controller/ECRController.java
@@ -1,7 +1,9 @@
package com.whyc.controller;
import com.whyc.dto.Response;
+import com.whyc.pojo.ECR;
import com.whyc.service.ECRService;
+import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -9,8 +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)
@@ -32,8 +37,51 @@
if(!name.substring(name.length()-4).equals(".xls") && !name.substring(name.length()-5).equals(".xlsx")){
response.set(1,false,"鏂囦欢瑙ｆ瀽閿欒:涓婁紶鏍煎紡闈瀍xcel鏍煎紡");
}else{
- response = service.ecrImportByExcel(multipartFile.getInputStream());
+ response = service.ecrImportByExcel(multipartFile);
}
return response;
}
+
+ @ApiOperation("鎵嬪姩杈撳叆")
+ @PostMapping("ecrImport")
+ public Response ecrImport(@RequestBody ECR ecr){
+ return service.ecrImport(ecr);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨECR璁板綍")
+ @GetMapping("searchEcr")
+ 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;
+ Date testTime2= null;
+ try {
+ testTime1 = ActionUtil.sdfwithALL.parse(createTime);
+ testTime2 = ActionUtil.sdfwithALL.parse(createTime1);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ 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