From dec87b5bb0eff15844a2be63e7c1d01a1594b0d4 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期六, 27 八月 2022 16:11:13 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/service/WorksheetMainService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index 46297cd..51b4873 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -14,11 +14,11 @@
import com.whyc.pojo.*;
import com.whyc.util.CommonUtil;
import com.whyc.util.Zip4jUtil;
+import org.aspectj.util.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.FileCopyUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -136,10 +136,10 @@
String dateFormat = new SimpleDateFormat("YYYY-MM").format(new Date());
long timeStamp = System.currentTimeMillis();
String filePath = rootFile + "product_approving" + File.separator + user.getName() + File.separator + dateFormat+ File.separator + timeStamp;
- String inFilePath = rootFile + "product" + File.separator + product.getParentModel() + File.separator + "standard"+ File.separator;
+ String inFilePath = rootFile + "product" + File.separator + product.getParentModel() + File.separator + "standard"+ File.separator + product.getVersion();
File parentFile = new File(filePath);
- FileCopyUtils.copy(new File(inFilePath),parentFile);
-
+ //FileCopyUtils.copy(new File(inFilePath),parentFile);
+ FileUtil.copyDir(new File(inFilePath),parentFile);
productApproving.setFileUrl(filePath);
bomList.clear();
productBomList.forEach(bom->{
--
Gitblit v1.9.1