改革任务、行政区看板总进度默认按进度从快到慢进行排序

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@@ -866,6 +866,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             if (paySelf.compareTo(BigDecimal.ZERO) > 0) {
                 paySelfExecutionRate = paySelf.divide(totalSelf, 2, RoundingMode.HALF_UP);
             }
+            //进度
+            String progress = this.getProgress(Ids).getProjectProgress();
 
             result = NewFundOV.builder().totalMoney(String.valueOf(totalAmount)).payAmount(String.valueOf(payAmount))
                     .totalCentral(String.valueOf(totalCentral)).payCentral(String.valueOf(payCentral))
@@ -880,6 +882,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
                     .payCityExecutionRate(String.valueOf(payCityExecutionRate))
                     .payCountyExecutionRate(String.valueOf(payCountyExecutionRate))
                     .paySelfExecutionRate(String.valueOf(paySelfExecutionRate))
+                    .projectProgress(progress)
                     .build();
         }
         return result;
@@ -1078,11 +1081,13 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             if(Objects.equals(condition, "reformName")){
                 fundByConditionResponse.add(FundByConditionOV.builder().name(reformTasks.get(key)).totalMoney(fund.getTotalMoney())
                         .paymentExecutionRate(fund.getPaymentExecutionRate())
-                        .superiorFundExecutionRate(fund.getSuperiorFundExecutionRate()).build());
+                        .superiorFundExecutionRate(fund.getSuperiorFundExecutionRate())
+                        .projectProgress(fund.getProjectProgress()).build());
             }else{
                 fundByConditionResponse.add(FundByConditionOV.builder().name(key).totalMoney(fund.getTotalMoney())
                         .paymentExecutionRate(fund.getPaymentExecutionRate())
-                        .superiorFundExecutionRate(fund.getSuperiorFundExecutionRate()).build());
+                        .superiorFundExecutionRate(fund.getSuperiorFundExecutionRate())
+                        .projectProgress(fund.getProjectProgress()).build());
             }
 
         }
@@ -1090,7 +1095,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         NewFundOV totalFund = this.getFund(allProjectIds);
         FundByKindOV fundByTypeResponse = this.modelChange(totalFund);
         //进度排序
-        List<ProjectProgressOV> sortedProgressResponse = progressResponse.stream().sorted(Comparator.comparing(ProjectProgressOV::getProjectProgress).reversed()).collect(Collectors.toList());;
+        List<ProjectProgressOV> sortedProgressResponse = progressResponse.stream().sorted(Comparator.comparing(ProjectProgressOV::getProjectProgress)).collect(Collectors.toList());;
 
         if(Objects.equals(orderBy, "projectProgress")&& Objects.equals(orderDir, "descend")){
             sortedProgressResponse=progressResponse.stream().sorted(Comparator.comparing(ProjectProgressOV::getProjectProgress).reversed()).collect(Collectors.toList());
@@ -1098,7 +1103,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             sortedProgressResponse=progressResponse.stream().sorted(Comparator.comparing(ProjectProgressOV::getProjectProgress)).collect(Collectors.toList());
         }
         //资金执行率和上级资金执行率排序
-        List<FundByConditionOV> sortedFundByConditionResponse = fundByConditionResponse.stream().sorted(Comparator.comparing(FundByConditionOV::getPaymentExecutionRate).reversed()).collect(Collectors.toList());;
+        //默认按照进度降序
+        List<FundByConditionOV> sortedFundByConditionResponse = fundByConditionResponse.stream().sorted(Comparator.comparing(FundByConditionOV::getProjectProgress)).collect(Collectors.toList());;
         if (Objects.equals(orderBy, "paymentExecutionRate")&& Objects.equals(orderDir, "descend")){
             sortedFundByConditionResponse=fundByConditionResponse.stream().sorted(Comparator.comparing(FundByConditionOV::getPaymentExecutionRate).reversed()).collect(Collectors.toList());
         } else if (Objects.equals(orderBy, "paymentExecutionRate") && Objects.equals(orderDir, "ascend")) {

huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundByConditionOV.java

@@ -17,5 +17,7 @@ public class FundByConditionOV {
 
     private String superiorFundExecutionRate;
 
+    private String projectProgress;
+
 
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundByKindOV.java

@@ -39,4 +39,5 @@ public class FundByKindOV {
 
     private String paySelfExecutionRate;
 
+
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/NewFundOV.java

@@ -43,4 +43,6 @@ public class NewFundOV {
 
     private String paySelfExecutionRate;
 
+    private String projectProgress;
+
 }