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 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 sortedProgressResponse = progressResponse.stream().sorted(Comparator.comparing(ProjectProgressOV::getProjectProgress).reversed()).collect(Collectors.toList());; + List 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 sortedFundByConditionResponse = fundByConditionResponse.stream().sorted(Comparator.comparing(FundByConditionOV::getPaymentExecutionRate).reversed()).collect(Collectors.toList());; + //默认按照进度降序 + List 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; + }