From b848451e8889fea12ce40b7818c1b8d84b50ea02 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 01 九月 2022 13:41:07 +0800
Subject: [PATCH] 权限管理组合操作
---
src/main/java/com/whyc/service/WorksheetMainService.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index 827fe7a..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->{
@@ -646,7 +646,10 @@
//鍒ゆ柇鏄摢绉嶇被鍨嬬殑瀹℃壒,杩斿洖涓嶅悓鐨勭被鍨� 鍏蜂綋鏁版嵁
Integer type = getInfoById(id).getType();
if(type.intValue() == EnumWorksheetType.ProductBom.getType()) {
- return mainMapper.getLinkList(id);
+ WorksheetMain main = mainMapper.getLinkList(id);
+ List<ProductBomApproving> pbaList = approvingService.getList(main.getProductApproving().getId());
+ main.getProductApproving().setBomApprovingList(pbaList);
+ return main;
}else if(type.intValue() == EnumWorksheetType.Material.getType()){
return mainMapper.getLinkListWithMaterials(id);
}else{ //鐗╂枡-浜у搧
--
Gitblit v1.9.1