表单顺序混乱补充

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

@@ -613,10 +613,13 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 //        if(info!=null){
 //            resultTabs.forEach(tab->tab.setFileName(info.getName()));
 //        }
+
         if (Optional.ofNullable(wbsTreeContract.getIsUseSort()).orElse(0) == 0) {
             //表单排序
             if (resultTabs.size() > 0) {
                 sortTabsByIsTypePrivatePid(resultTabs);
+                // 使用自定义 Comparator 进行排序
+                resultTabs.sort(new WbsTreeContractComparator());
                List<AppWbsTreeContractVO> resultTabsToCopy = this.sortTabs(resultTabs, "__"); //复制表排序
                 return this.sortTabs(resultTabsToCopy, "_PL_"); //频率表排序
             }
@@ -630,7 +633,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         if(!resultTabs.isEmpty()){
            StringBuilder ids=new StringBuilder("");
             List<Integer>sorts1=new ArrayList<>();
-            List<Integer>sorts2=new ArrayList<>();
             for (AppWbsTreeContractVO resultTab : resultTabs) {
                 if(resultTab.getExcelId()==null){
                     continue;
@@ -638,7 +640,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 //拿到质量检验表附表的pkeyId,以及sort
                 if(resultTab.getExcelId()==1777969831956520962L||resultTab.getExcelId()==1636534954773417986L||resultTab.getExcelId()==1626130998410768385L){
                     ids.append(resultTab.getPKeyId()+",");
-                    sorts2.add(resultTab.getSort());
                     continue;
                 }
                 //检验附表以外的排序有问题的表单修改
@@ -661,21 +662,19 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     sorts1.add(resultTab.getSort());
                 }
             }
-            if(!sorts1.isEmpty()&&!sorts2.isEmpty()){
+            if(!sorts1.isEmpty()){
                 String idss = ids.substring(0, ids.length() - 1);
                 //tableType=1 的表单sort的最大值
                 Integer maxSort = Collections.max(sorts1);
-                //质量检验表附表 的sort的最小值
-                Integer minSort = Collections.min(sorts2);
-                if(!Objects.equals(maxSort, minSort)){
                     resultTabs.forEach(r->{
                        if(idss.contains(r.getPKeyId()+"")){
-                           r.setSort(maxSort);
+                        if(!Objects.equals(r.getSort(), maxSort)){
+                            r.setSort(maxSort);
+                            String sql2="update m_wbs_tree_contract set sort="+maxSort+" where p_key_id="+r.getPKeyId();
+                            jdbcTemplate.update(sql2);
+                        }
                        }
                     });
-                    String sql2="update m_wbs_tree_contract set sort="+maxSort+" where p_key_id in ("+idss+")";
-                    jdbcTemplate.update(sql2);
-                }
             }
         }
     }