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/service/ECRService.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/ECRService.java b/src/main/java/com/whyc/service/ECRService.java
index 3e39e07..8326d96 100644
--- a/src/main/java/com/whyc/service/ECRService.java
+++ b/src/main/java/com/whyc/service/ECRService.java
@@ -55,7 +55,6 @@
}
String excelFilePath = excelDir + File.separator + originalFilename.substring(0,originalFilename.lastIndexOf(".")) + "_" + dateUnion +originalFilename.substring(originalFilename.lastIndexOf("."));
String excelHttpUrl = excelFilePath.substring(excelDir.lastIndexOf("doc_file"+ File.separator + "ecr"));
- multipartFile.transferTo(new File(excelFilePath));
Workbook workbook = null;
workbook = WorkbookFactory.create(inputStream);
@@ -258,6 +257,8 @@
if(ecrNumberObj!= null) {
return new Response().set(1,false,"ecr缂栧彿宸插瓨鍦�");
}
+ //瀛樺偍鎿嶄綔鎵ц
+ multipartFile.transferTo(new File(excelFilePath));
mapper.insertBatchSomeColumn(ecrList);
return new Response().set(1,true,"瀵煎叆瀹屾垚");
@@ -330,9 +331,17 @@
return list;
}
- public void exportExcel(HttpServletResponse response) {
- //鏌ヨ鎵�鏈�
- List<ECR> ecrList = mapper.selectList(null);
+ public void exportExcel(HttpServletResponse response, List<Integer> ids) {
+ List<ECR> ecrList;
+ if(ids == null) {
+ //鏌ヨ鎵�鏈�
+ ecrList = mapper.selectList(null);
+ }else{
+ //鏌ヨids鐨勮褰�
+ QueryWrapper<ECR> query = Wrappers.query();
+ query.in("id",ids);
+ ecrList = mapper.selectList(query);
+ }
int size = ecrList.size();
//ECR缂栧彿,鐢宠鏃ユ湡,鐢宠浜�,鍙樻洿鎻忚堪,鍙樻洿鏂欏彿,鍙樻洿鍨嬪彿,鍙樻洿鎵�灞炲瀷鍙�,澶勭悊鏂瑰紡,鍒涘缓鏃堕棿
String[] title = new String[]{"骞翠唤","ECR缂栧彿","鐢宠鏃ユ湡","鐢宠浜�","鍙樻洿鎻忚堪","鍙樻洿鏂欏彿","鍙樻洿鍨嬪彿","鍙樻洿鎵�灞炲瀷鍙�","澶勭悊鏂瑰紡","鍒涘缓鏃堕棿"};
@@ -354,12 +363,12 @@
values[i][8] = ecr.getSolution();
values[i][9] = DateUtil.YYYY_MM_DD_HH_MM_SS.format(ecr.getCreateTime());
}
- String dateFormat = DateUtil.YYYY_MM_DD_HH_MM_SS.format(new Date());
+ String dateFormat = DateUtil.YYYY_MM_DD_HH_MM_SS2.format(new Date());
ExcelUtil.exportExcel("鍙樻洿璁板綍娓呭崟_"+dateFormat,"娓呭崟",title,values,null,response);
}
//鍒犻櫎ECR璁板綍
public Response deleteEcr(String number, String filePath) {
- if(!filePath.isEmpty()){
+ if(!(filePath==null||filePath.isEmpty())){
String fileDirName = FileDirPath.getFileDirName();
File file = new File(fileDirName+File.separator+filePath);
if(!file.isDirectory()){
@@ -372,4 +381,12 @@
int delFlag=mapper.delete(wrapper);
return new Response().set(1,delFlag>0,"鍒犻櫎ECR");
}
+ //鍙嶉涓嬫媺鏌ヨECR璁板綍
+ public Response searchEcrInFeedback() {
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.select("distinct number");
+ wrapper.orderByDesc("create_time");
+ List list=mapper.selectList(wrapper);
+ return new Response().setII(1,list.size()>0,list,"鏌ヨECR璁板綍");
+ }
}
--
Gitblit v1.9.1