质检同步排序

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

@@ -413,7 +413,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
 
         for (WbsTree wbsTree : wbsTreeListAll) {
             WbsTreePrivate wbsTreePrivate = maps.get(wbsTree.getId());
-            //判断相同节点基础信息、元素表类型、元素表所属方是否发生改变
+            //判断相同节点基础信息、元素表类型、元素表所属方是否发生改变（表也要同步）
             if (wbsTreePrivate != null && this.fieldsNotEqualPublicWbs(wbsTree, wbsTreePrivate)) {
                 //修改项目wbs信息
                 WbsTreePrivate wbsPrivate = BeanUtil.copyProperties(wbsTree, WbsTreePrivate.class);
@@ -563,18 +563,6 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
      * @return boolean
      */
     private boolean fieldsNotEqualPublicWbs(WbsTree a, WbsTreePrivate b) {
-        if (new Integer(1).equals(a.getType())) {
-            return !Objects.equals(nonNull(a.getNodeName()), nonNull(b.getNodeName()))
-                    || !Objects.equals(nonNull(a.getNodeType()), nonNull(b.getNodeType()))
-                    || !Objects.equals(nonNull(a.getMajorDataType()), nonNull(b.getMajorDataType()))
-                    || !Objects.equals(nonNull(a.getTableType()), nonNull(b.getTableType()))
-                    || !Objects.equals(nonNull(a.getTableOwner()), nonNull(b.getTableOwner()))
-                    || !Objects.equals(nonNull(a.getImportMatchingInfo()), nonNull(b.getImportMatchingInfo()))
-                    || !Objects.equals(nonNull(a.getMixRatioTestIds()), nonNull(b.getMixRatioTestIds()))
-                    || !Objects.equals(nonNull(a.getInitTableId()), nonNull(b.getInitTableId()))
-                    || !Objects.equals(nonNull(a.getInitTableName()), nonNull(b.getInitTableName()))
-                    || !Objects.equals(a.getSort(), b.getSort());
-        }
         return !Objects.equals(nonNull(a.getNodeName()), nonNull(b.getNodeName()))
                 || !Objects.equals(nonNull(a.getNodeType()), nonNull(b.getNodeType()))
                 || !Objects.equals(nonNull(a.getMajorDataType()), nonNull(b.getMajorDataType()))
@@ -583,7 +571,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 || !Objects.equals(nonNull(a.getImportMatchingInfo()), nonNull(b.getImportMatchingInfo()))
                 || !Objects.equals(nonNull(a.getMixRatioTestIds()), nonNull(b.getMixRatioTestIds()))
                 || !Objects.equals(nonNull(a.getInitTableId()), nonNull(b.getInitTableId()))
-                || !Objects.equals(nonNull(a.getInitTableName()), nonNull(b.getInitTableName()));
+                || !Objects.equals(nonNull(a.getInitTableName()), nonNull(b.getInitTableName()))
+                || !Objects.equals(a.getSort(), b.getSort());
     }
 
     /**
@@ -594,20 +583,6 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
      * @return boolean
      */
     private boolean fieldsNotEqualPrivateWbs(WbsTreePrivate a, WbsTreePrivate b) {
-        if (new Integer(1).equals(a.getType())) {
-            return !Objects.equals(nonNull(a.getNodeName()), nonNull(b.getNodeName()))
-                    || !Objects.equals(nonNull(a.getNodeType()), nonNull(b.getNodeType()))
-                    || !Objects.equals(nonNull(a.getMajorDataType()), nonNull(b.getMajorDataType()))
-                    || !Objects.equals(nonNull(a.getTableType()), nonNull(b.getTableType()))
-                    || !Objects.equals(nonNull(a.getTableOwner()), nonNull(b.getTableOwner()))
-                    || !Objects.equals(nonNull(a.getImportMatchingInfo()), nonNull(b.getImportMatchingInfo()))
-                    || !Objects.equals(nonNull(a.getMixRatioTestIds()), nonNull(b.getMixRatioTestIds()))
-                    || !Objects.equals(nonNull(a.getInitTableId()), nonNull(b.getInitTableId()))
-                    || !Objects.equals(nonNull(a.getInitTableName()), nonNull(b.getInitTableName()))
-                    || !Objects.equals(nonNull(a.getHtmlUrl()), nonNull(b.getHtmlUrl()))
-                    || !Objects.equals(nonNull(a.getExcelId()), nonNull(b.getExcelId()))
-                    || !Objects.equals(nonNull(a.getSort()), nonNull(b.getSort()));
-        }
         return !Objects.equals(nonNull(a.getNodeName()), nonNull(b.getNodeName()))
                 || !Objects.equals(nonNull(a.getNodeType()), nonNull(b.getNodeType()))
                 || !Objects.equals(nonNull(a.getMajorDataType()), nonNull(b.getMajorDataType()))
@@ -618,7 +593,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 || !Objects.equals(nonNull(a.getInitTableId()), nonNull(b.getInitTableId()))
                 || !Objects.equals(nonNull(a.getInitTableName()), nonNull(b.getInitTableName()))
                 || !Objects.equals(nonNull(a.getHtmlUrl()), nonNull(b.getHtmlUrl()))
-                || !Objects.equals(nonNull(a.getExcelId()), nonNull(b.getExcelId()));
+                || !Objects.equals(nonNull(a.getExcelId()), nonNull(b.getExcelId()))
+                || !Objects.equals(nonNull(a.getSort()), nonNull(b.getSort()));
     }
 
     /**
@@ -954,7 +930,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                         }
                     } else {
                         /*假如对应节点不存在，则把节点内容添加到待新增列表*/
-                      //  insertMap.put(v.get("privateId").toString() + v.get("k"), v);
+                        //  insertMap.put(v.get("privateId").toString() + v.get("k"), v);
                         insertMapList.add(v);
                     }
                 });
@@ -971,18 +947,18 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 List<WbsParam> insertList = new ArrayList<>();
                 if (!insertMapList.isEmpty()) {
                     List<WbsTreePrivate> targetList = Optional.ofNullable(this.list(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getProjectId, projectId).in(WbsTreePrivate::getId, insertMapList.stream().map(m -> m.get("privateId")).collect(Collectors.toList())))).orElse(new ArrayList<>());
-                     Map<String,List<Map<String,Object>>>insertGroup =insertMapList.stream().collect(Collectors.groupingBy(m->m.get("privateId").toString()));
+                    Map<String, List<Map<String, Object>>> insertGroup = insertMapList.stream().collect(Collectors.groupingBy(m -> m.get("privateId").toString()));
                     targetList.forEach(e -> {
-                       List<Map<String, Object>> nodeParamList = insertGroup.get(e.getId().toString());
-                       if(Func.isNotEmpty(nodeParamList)){
-                             nodeParamList.forEach(kmp->{
-                                 if (kmp != null) {
-                                     WbsParam one = BeanUtil.toBean(kmp, WbsParam.class);
-                                     one.setNodeId(e.getPKeyId());
-                                     insertList.add(one);
-                                 }
-                             });
-                       }
+                        List<Map<String, Object>> nodeParamList = insertGroup.get(e.getId().toString());
+                        if (Func.isNotEmpty(nodeParamList)) {
+                            nodeParamList.forEach(kmp -> {
+                                if (kmp != null) {
+                                    WbsParam one = BeanUtil.toBean(kmp, WbsParam.class);
+                                    one.setNodeId(e.getPKeyId());
+                                    insertList.add(one);
+                                }
+                            });
+                        }
                     });
                     if (!insertList.isEmpty()) {
                         insertList.forEach(i -> i.setId(SnowFlakeUtil.getId()));