Commit c1af0cac8617c30f7db7b62b442ae081b64228fe

Authored by 姜超
1 parent 4ba9c650

feature(bug): 排序修改

排序修改
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/kpi/KpiIndicatorRankStaffVO.java
@@ -85,10 +85,10 @@ public class KpiIndicatorRankStaffVO implements Comparable<KpiIndicatorRankStaff @@ -85,10 +85,10 @@ public class KpiIndicatorRankStaffVO implements Comparable<KpiIndicatorRankStaff
85 @Override 85 @Override
86 public int compareTo(KpiIndicatorRankStaffVO other) { 86 public int compareTo(KpiIndicatorRankStaffVO other) {
87 if (Boolean.TRUE.equals(this.inclusion) && Boolean.FALSE.equals(other.inclusion)) { 87 if (Boolean.TRUE.equals(this.inclusion) && Boolean.FALSE.equals(other.inclusion)) {
88 - return 1; 88 + return -1;
89 } 89 }
90 if (Boolean.FALSE.equals(this.inclusion) && Boolean.TRUE.equals(other.inclusion)) { 90 if (Boolean.FALSE.equals(this.inclusion) && Boolean.TRUE.equals(other.inclusion)) {
91 - return - 1; 91 + return 1;
92 } 92 }
93 return Optional.ofNullable(other.originValue).orElse(BigDecimal.ZERO) 93 return Optional.ofNullable(other.originValue).orElse(BigDecimal.ZERO)
94 .compareTo(Optional.ofNullable(this.originValue).orElse(BigDecimal.ZERO)); 94 .compareTo(Optional.ofNullable(this.originValue).orElse(BigDecimal.ZERO));