From 0fad63546fe9acaadcb65205903bd9926e3fef1c Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 28 七月 2022 15:48:52 +0800
Subject: [PATCH] 更新工作流
---
src/main/java/com/whyc/service/ProductBomApprovingService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomApprovingService.java b/src/main/java/com/whyc/service/ProductBomApprovingService.java
index e6e3136..272bdca 100644
--- a/src/main/java/com/whyc/service/ProductBomApprovingService.java
+++ b/src/main/java/com/whyc/service/ProductBomApprovingService.java
@@ -12,6 +12,7 @@
import io.swagger.models.auth.In;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -34,6 +35,9 @@
@Resource
private ProductBomApprovingMapper mapper;
+
+ @Autowired
+ private WorksheetMainService mainService;
public List<ProductBomApproving> excelParse(InputStream inputStream) throws IOException, InvalidFormatException {
List<ProductBomApproving> list = new LinkedList<>();
@@ -127,7 +131,8 @@
long timeStamp = System.currentTimeMillis();
String filePath = rootFile + File.separator + "product_approving" + File.separator + user.getName() + File.separator + dateFormat+ File.separator + timeStamp;
File parentFile = new File(filePath);
- File zipFile = new File(filePath+File.separator+file.getOriginalFilename());
+ String originalFilename = file.getOriginalFilename();
+ File zipFile = new File(filePath+File.separator+ originalFilename);
if(!zipFile.exists()){
zipFile.mkdirs();
}
@@ -247,7 +252,10 @@
return new Response().set(1,false,"鎷掔粷瑙ｆ瀽,涓�娆″鎵瑰寘鍚笉鍚岀殑浜у搧淇敼");
}
}
- return response.setII(1,true,list,"瑙ｆ瀽瀹屾垚");
+ //閫氳繃鍖呭悕,鏌ヨ宸ュ崟娴佺▼瀹℃壒鏍囬
+ //String nextTitle = mainService.getNextTitle(originalFilename);
+ String nextTitle = originalFilename.substring(0,originalFilename.lastIndexOf("."));
+ return response.setIII(1,true,list,nextTitle,"瑙ｆ瀽瀹屾垚");
}
private List<FileUrlDTO> getDwgList(List<String> fileList) {
--
Gitblit v1.9.1