修复bug

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -70,28 +70,25 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         List<WbsTreeContract> list = baseMapper.findAllNodeList2(pawDTO.getProjectId(), pawDTO.getContractId(), pawDTO.getWbsId());
 
         //当前合同段所有表单Id
-        List<String> collect3 = new ArrayList<>();
+        List<String> collect1 = new ArrayList<>();
         //当前合同段所有节点Id
-        List<String> collect7 = new ArrayList<>();
+        List<String> collect2 = new ArrayList<>();
 
         if (list.size() > 0) {
             //所有表单
-            List<WbsTreeContract> collect2 = list.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
-            List<Long> collect4 = collect2.stream().map(WbsTreeContract::getId).collect(Collectors.toList());
-            collect3 = collect4.stream().map(String::valueOf).collect(Collectors.toList());
+            List<WbsTreeContract> collect3 = list.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
+            collect1 = collect3.stream().map(WbsTreeContract::getId).collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
 
             //所有节点
-            List<WbsTreeContract> collect5 = list.stream().filter(f -> f.getType() == 1).collect(Collectors.toList());
-            List<Long> collect6 = collect5.stream().map(WbsTreeContract::getId).collect(Collectors.toList());
-            collect7 = collect6.stream().map(String::valueOf).collect(Collectors.toList());
-
+            List<WbsTreeContract> collect4 = list.stream().filter(f -> f.getType() == 1).collect(Collectors.toList());
+            collect2 = collect4.stream().map(WbsTreeContract::getId).collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
         }
 
         //新增节点ids
-        List<String> collect8 = collect7;
-        List<String> saveIds = idList1.stream().filter(f -> !collect8.contains(f)).collect(Collectors.toList());
+        List<String> collect5 = collect2;
+        List<String> saveIds = idList1.stream().filter(f -> !collect5.contains(f)).collect(Collectors.toList());
         //删除节点ids
-        List<String> delIds = collect8.stream().filter(f -> !idList1.contains(f)).collect(Collectors.toList());
+        List<String> delIds = collect5.stream().filter(f -> !idList1.contains(f)).collect(Collectors.toList());
 
         if (saveIds.size() == 0 && delIds.size() == 0) {
             //节点id未变，只进行节点下的元素表的同步
@@ -114,15 +111,15 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             });
 
             //私有wbs树下所有元素表的Id
-            List<Long> collect = wbsTreePrivateList2.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
-            List<String> collect2 = collect.stream().map(String::valueOf).collect(Collectors.toList());
+            List<String> collect = wbsTreePrivateList2.stream().map(WbsTreePrivate::getId).collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
+
             //获取所有wbsTreePrivate新增的表单Id
-            List<String> diffRent1 = DiffListUtil.getDiffRent(collect2, collect3);
+            List<String> diffRent1 = DiffListUtil.getDiffRent(collect, collect1);
 
-            if (collect2.size() == collect3.size()) {
+            if (collect.size() == collect1.size()) {
                 throw new ServiceException("未检测到当前引用的私有wbs树下有新增的元素表信息");
             }
-            if (collect2.size() > collect3.size()) {
+            if (collect.size() > collect1.size()) {
                 //初始化
                 List<WbsTreeContract> wbsTreeContracts = new ArrayList<>();
                 wbsTreePrivateList.forEach(wbsTreePrivate -> {
@@ -134,7 +131,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     });
                 });
 
-                //baseMapper.insertBatchSomeColumn(wbsTreeContracts);
                 this.saveBatch(wbsTreeContracts, 10000);
             }
         } else {
@@ -210,7 +206,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 });
 
                 //新增合同段节点、表
-                //baseMapper.insertBatchSomeColumn(wbsTreeContractList);
                 insertBatch(wbsTreeContractList, 100);
 
                 //新增施工台账

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -613,7 +613,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         List<String> delIds = idList2.stream().filter(f -> !idList1.contains(f)).collect(Collectors.toList());
 
         if (saveIds.size() == 0 && delIds.size() == 0) {
-            //节点id未变，只进行节点下的元素表的同步  1.项目表单同步  2.同步到该项目下所有合同段wbs树
             //1.项目表单同步
             if (pawDTO.getReferenceType().equals("public")) {
                 //公有同步新增元素表
@@ -630,15 +629,11 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     wbsTreeListAll.addAll(wbsTreeList);
                 }
 
-                //所有节点信息
-                //List<WbsTree> wbsTreeListNodes = wbsTreeListAll.stream().filter(f -> f.getType() == 1).collect(Collectors.toList());
-
                 //所有表单信息
                 List<WbsTree> wbsTreeListTables = wbsTreeListAll.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
 
                 //公有元素表的id
-                List<Long> collect1 = wbsTreeListTables.stream().map(WbsTree::getId).collect(Collectors.toList());
-                List<String> collect2 = collect1.stream().map(String::valueOf).collect(Collectors.toList());
+                List<String> collect1 = wbsTreeListTables.stream().map(WbsTree::getId).collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
 
                 //获取项目私有wbs树下所有的节点、元素表
                 List<WbsTreePrivate> wbsTreePrivatesAll = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
@@ -649,10 +644,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
                 //私有下元素表id
                 List<WbsTreePrivate> collect = wbsTreePrivatesAll.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
-                List<Long> collect3 = collect.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
-                List<String> collect4 = collect3.stream().map(String::valueOf).collect(Collectors.toList());
+                List<String> collect2 = collect.stream().map(WbsTreePrivate::getId).collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
 
-                List<String> diffRent1 = DiffListUtil.getDiffRent(collect2, collect4);
+                List<String> diffRent1 = DiffListUtil.getDiffRent(collect1, collect2);
 
                 //修改公有wbs节点信息、元素表基础信息到项目级wbs、合同段wbs
                 updateWbsInfoPrivateAsync(wbsTreeListAll, wbsTreePrivatesAll, pawDTO.getProjectId());
@@ -662,7 +656,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     return true;
 
                 } else {
-                    if (collect2.size() > collect4.size()) {
+                    if (collect1.size() > collect2.size()) {
                         //获取当前项目下所有施工合同段id
                         List<ContractInfo> contractInfoIds = contractInfoMapper.selectContractIdByProjectId(pawDTO.getProjectId());
                         //公有同步元素表
@@ -747,15 +741,11 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                         .eq(WbsTreePrivate::getStatus, 1)
                 );
 
-                //私有引用项目的节点信息
-                //List<WbsTreePrivate> WbsTreePrivateNodes = wbsTreePrivateAllOld.stream().filter(f -> f.getType() == 1).collect(Collectors.toList());
-
                 //私有引用项目的表单信息
                 List<WbsTreePrivate> WbsTreePrivateTables = wbsTreePrivateAllOld.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
 
                 //当前新增表单的id
-                List<Long> collect1 = WbsTreePrivateTables.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
-                List<String> collect2 = collect1.stream().map(String::valueOf).collect(Collectors.toList());
+                List<String> collect1 = WbsTreePrivateTables.stream().map(WbsTreePrivate::getId).collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
 
                 //获取当前项目私有wbs树下当前所有节点、元素表
                 List<WbsTreePrivate> wbsTreePrivatesAllNow = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
@@ -765,10 +755,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
                 //当前存在的表单的id
                 List<WbsTreePrivate> wbsTreePrivateNowTypes = wbsTreePrivatesAllNow.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
-                List<Long> collect3 = wbsTreePrivateNowTypes.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
-                List<String> collect4 = collect3.stream().map(String::valueOf).collect(Collectors.toList());
+                List<String> collect2 = wbsTreePrivateNowTypes.stream().map(WbsTreePrivate::getId).collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
 
-                List<String> diffRent1 = DiffListUtil.getDiffRent(collect2, collect4);
+                List<String> diffRent1 = DiffListUtil.getDiffRent(collect1, collect2);
 
                 //修改私有wbs节点信息、元素表基础信息到项目级wbs、合同段wbs
                 updateWbsInfoContractAsync(wbsTreePrivateAllOld, wbsTreePrivatesAllNow, pawDTO.getProjectId(), pawDTO.getPrimaryKeyId());
@@ -777,7 +766,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     return true;
 
                 } else {
-                    if (collect2.size() > collect4.size()) {
+                    if (collect1.size() > collect2.size()) {
                         //获取当前项目下所有施工合同段id
                         List<ContractInfo> contractInfoIds = contractInfoMapper.selectContractIdByProjectId(pawDTO.getProjectId());
                         //私有同步元素表