From 888c782f8b3ade9b2bd50c6183e7b534ad05f069 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 26 六月 2023 10:47:25 +0800
Subject: [PATCH] sop修改
---
src/main/java/com/whyc/service/SOPService.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/SOPService.java b/src/main/java/com/whyc/service/SOPService.java
index 930cd46..be8a87b 100644
--- a/src/main/java/com/whyc/service/SOPService.java
+++ b/src/main/java/com/whyc/service/SOPService.java
@@ -6,6 +6,7 @@
import com.whyc.pojo.SOP;
import com.whyc.pojo.SOPFileType;
import com.whyc.pojo.SOPProduct;
+import com.whyc.pojo.Software;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
import com.whyc.util.DateUtil;
@@ -286,14 +287,15 @@
sopProductList.add(product);
}
- //瀛樺偍excel鏂囦欢,/sop_submit/xxx_202306250506.xlsx
- String originalFilename = multipartFile.getOriginalFilename();
+
+ //瀛樺偍excel鏂囦欢,/sop_submit/xxx_202306250506.xlsx(鏀癸紝涓嶅瓨绮梕xcel浜�)
+ /*String originalFilename = multipartFile.getOriginalFilename();
String[] fileNameSplit = originalFilename.split("\\.");
String dateFormat = DateUtil.YYYY_MM_DD_HH_MM_SS_UNION.format(new Date());
String newFileName = fileNameSplit[0]+"_"+dateFormat+"."+fileNameSplit[1];
String fileUrl = FileUtil.saveFile(multipartFile,"/sop_submit/"+newFileName);
- sop.setFileUrl(fileUrl);
+ sop.setFileUrl(fileUrl);*/
sopProductList = sopProductList.stream().filter(product -> !product.getCode().equals("")).collect(Collectors.toList());
sop.setSopProductList(sopProductList);
@@ -302,10 +304,15 @@
}
@Transactional
- public Response add(SOP sop) throws IOException {
+ public Response add(SOP sop,MultipartFile multipartFile) throws IOException {
List<SOPProduct> sopProductList = sop.getSopProductList();
- String fileUrlTemp = sop.getFileUrl();
- fileUrlTemp = fileUrlTemp.replace("sop_submit", "sop");
+ String originalFilename = multipartFile.getOriginalFilename();
+ String[] fileNameSplit = originalFilename.split("\\.");
+ String dateFormat = DateUtil.YYYY_MM_DD_HH_MM_SS_UNION.format(new Date());
+ String newFileName = fileNameSplit[0]+"_"+dateFormat+"."+fileNameSplit[1];
+ String fileUrlTemp = FileUtil.saveFile(multipartFile,"/sop/"+newFileName);
+ //String fileUrlTemp = sop.getFileUrl();
+ //fileUrlTemp = fileUrlTemp.replace("sop_submit", "sop");
sop.setFileUrl(fileUrlTemp);
mapper.insert(sop);
if(sopProductList.size()>0) {
@@ -313,7 +320,7 @@
productService.insertBatch(sopProductList);
}
//鏂囦欢杞Щ
- String fileUrl = sop.getFileUrl();
+ /*String fileUrl = sop.getFileUrl();
String projectDir = CommonUtil.getProjectDir();
String filePathFrom = projectDir + File.separator + fileUrl.replace("sop","sop_submit");
File fileFrom = new File(filePathFrom);
@@ -322,7 +329,7 @@
if(!fileTo.getParentFile().exists()){
fileTo.getParentFile().mkdirs();
}
- FileCopyUtils.copy(fileFrom,fileTo);
+ FileCopyUtils.copy(fileFrom,fileTo);*/
//鏂板鐨勬枃浠剁被鍨�,杩藉姞鍒拌〃涓�
List<SOPFileType> typeList = new LinkedList<>();
--
Gitblit v1.9.1