diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 25e9a0748..be56b93b6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -486,6 +486,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl attestationRankSort(String orderBy, String orderByField, List dummyInventoryInfoEOList) { List list = new LinkedList<>(); + Collator comparator = Collator.getInstance(Locale.CHINESE); if(ObjectUtils.isNotEmpty(orderByField) && "attestationRank".equals(orderByField)){ List wvta = dummyInventoryInfoEOList.stream() .filter(e -> e.getAttestationRankStr().startsWith(AttestationRankEnum.WVTA.getValue())).collect(Collectors.toList()); @@ -502,6 +503,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl list, Collator comparator) { + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(list,(e1, e2)->{ + return comparator.compare(e1.getAttestationRankStr(),e2.getAttestationRankStr()); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(list,(e1,e2)->{ + return comparator.compare(e2.getAttestationRankStr(),e1.getAttestationRankStr()); + }); + } + } + //倒序 + private void attestationRankReverse(String orderBy, List list, Collator comparator) { + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(list,(e1, e2)->{ + return comparator.compare(e1.getAttestationRankStr(),e2.getAttestationRankStr()); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(list,(e1,e2)->{ + return comparator.compare(e2.getAttestationRankStr(),e1.getAttestationRankStr()); + }); + } + } + private List stateSort(String orderBy, String orderByField, List dummyInventoryInfoEOList, List list) { if(ObjectUtils.isNotEmpty(orderByField) && "state".equals(orderByField)){ List active = dummyInventoryInfoEOList.stream() diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 14dc6076d..2a462f93f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1084,8 +1084,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl na = dummyInventoryInfoEOList.stream() .filter(e -> e.getAttestationRank_dictText().startsWith(AttestationRankEnum.NA.getValue())).collect(Collectors.toList()); - + Collator comparator = Collator.getInstance(Locale.CHINESE); if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + attestationRankPositive(orderBy, wvta, comparator); + attestationRankPositive(orderBy, vta, comparator); + attestationRankPositive(orderBy, market, comparator); + attestationRankPositive(orderBy, regu, comparator); + attestationRankPositive(orderBy, na, comparator); //正序 List collect = dummyInventoryInfoEOList.stream().filter(e -> StringUtils.isBlank(e.getAttestationRank_dictText())).collect(Collectors.toList()); list.addAll(collect); @@ -1096,6 +1101,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list, Collator comparator) { + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(list,(e1, e2)->{ + return comparator.compare(e1.getAttestationRank_dictText(),e2.getAttestationRank_dictText()); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(list,(e1,e2)->{ + return comparator.compare(e2.getAttestationRank_dictText(),e1.getAttestationRank_dictText()); + }); + } + } + //倒序 + private void attestationRankReverse(String orderBy, List list, Collator comparator) { + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(list,(e1, e2)->{ + return comparator.compare(e1.getAttestationRank_dictText(),e2.getAttestationRank_dictText()); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(list,(e1,e2)->{ + return comparator.compare(e2.getAttestationRank_dictText(),e1.getAttestationRank_dictText()); + }); + } + } + /** * 数据字典数据处理方法 * @param result 返回值