From f6d0b2100db1242f45e9c8833917b326c96955b9 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 11 八月 2022 09:50:04 +0800
Subject: [PATCH] 更新散装件审批
---
src/main/java/com/whyc/service/ProductBomApprovingService.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomApprovingService.java b/src/main/java/com/whyc/service/ProductBomApprovingService.java
index d68b1c7..e258353 100644
--- a/src/main/java/com/whyc/service/ProductBomApprovingService.java
+++ b/src/main/java/com/whyc/service/ProductBomApprovingService.java
@@ -22,10 +22,8 @@
import java.io.*;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
public class ProductBomApprovingService {
@@ -362,6 +360,20 @@
return response.set(1,false,excelName+"涓揣鍝佺紪鐮�:"+subCode+"鍦╞om琛ㄤ腑涓嶅瓨鍦�");
}
}
+ //澶勭悊鍚嶇О閲嶅鐨勫瓙浠�
+ List<ProductBomApproving> newBomList = new LinkedList<>();
+ Map<String, List<ProductBomApproving>> subNameMap = bomList.stream().collect(Collectors.groupingBy(ProductBomApproving::getSubName));
+ subNameMap.forEach((subName,approvingList)->{
+ if(approvingList.size()>1){
+ for (int i = 0; i < approvingList.size(); i++) {
+ ProductBomApproving bomApproving = approvingList.get(i);
+ bomApproving.setSubName(subName+(i+1));
+ newBomList.add(bomApproving);
+ }
+ }else{
+ newBomList.addAll(approvingList);
+ }
+ });
String nextTitle = originalFilename.substring(0,originalFilename.lastIndexOf("."));
return response.setIII(1,true,bomList,nextTitle,"瑙ｆ瀽瀹屾垚");
}
--
Gitblit v1.9.1