From 27e6e3ea1d6385176ac6a921496e5f2c4a963c14 Mon Sep 17 00:00:00 2001
From: Jinyuanyuan <1197651512@qq.com>
Date: Fri, 14 Jun 2024 15:37:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=9D=A9=E4=BB=BB=E5=8A=A1=E3=80=81?=
 =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E7=9C=8B=E6=9D=BF=E6=80=BB=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E9=BB=98=E8=AE=A4=E6=8C=89=E8=BF=9B=E5=BA=A6=E4=BB=8E?=
 =?UTF-8?q?=E5=BF=AB=E5=88=B0=E6=85=A2=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HuzhouProjectinfoServiceImpl.java | 14 ++++++++++----
 .../admin/modules/huzhou/vo/FundByConditionOV.java |  2 ++
 .../easy/admin/modules/huzhou/vo/FundByKindOV.java |  1 +
 .../easy/admin/modules/huzhou/vo/NewFundOV.java    |  2 ++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index 107838a..91916ea 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/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")) {
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundByConditionOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundByConditionOV.java
index 49e480d..37d9106 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundByConditionOV.java
+++ b/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;
+
 
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundByKindOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundByKindOV.java
index 267fbb1..fd4e8fe 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundByKindOV.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/FundByKindOV.java
@@ -39,4 +39,5 @@ public class FundByKindOV {
 
     private String paySelfExecutionRate;
 
+
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/NewFundOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/NewFundOV.java
index 90f0492..5929a65 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/NewFundOV.java
+++ b/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;
+
 }