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 69490b99b..730e194b6 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 @@ -991,14 +991,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.REG_ENG_REJECTED.getName())).collect(Collectors.toList()); List homoEngRejected = dummyInventoryInfoEOList.stream() .filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.HOMO_ENG_REJECTED.getName())).collect(Collectors.toList()); + List listToConfirm = dummyInventoryInfoEOList.stream() + .filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getName())).collect(Collectors.toList()); + List rejected = dummyInventoryInfoEOList.stream() + .filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.REJECTED.getName())).collect(Collectors.toList()); if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { //正序 list.addAll(notStarted); + list.addAll(listToConfirm); list.addAll(regEngToConfirm); list.addAll(homoEngToConfirm); list.addAll(accepted); + list.addAll(rejected); list.addAll(regEngRejected); list.addAll(homoEngRejected); @@ -1006,9 +1012,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ - return comparator.compare(e1.getCertificationProgressName(),e2.getCertificationProgressName()); + return comparator.compare(e2.getCertificationProgressName(),e1.getCertificationProgressName()); }); }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ Collections.sort(result,(e1,e2)->{ - return comparator.compare(e2.getCertificationProgressName(),e1.getCertificationProgressName()); + return comparator.compare(e1.getCertificationProgressName(),e2.getCertificationProgressName()); }); } } @@ -512,19 +512,19 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl list) { if(ObjectUtils.isNotEmpty(orderByField) && "projectStatusAssess".equals(orderByField)){ List red = result.stream() - .filter(e -> e.getProjectStatusAssess().equals(ColourEnum.RED.getValue())).collect(Collectors.toList()); + .filter(e -> ColourEnum.RED.getValue().equals(e.getProjectStatusAssess())).collect(Collectors.toList()); List yellow = result.stream() - .filter(e -> e.getProjectStatusAssess().equals(ColourEnum.YELLOW.getValue())).collect(Collectors.toList()); + .filter(e -> ColourEnum.YELLOW.getValue().equals(e.getProjectStatusAssess())).collect(Collectors.toList()); List green = result.stream() - .filter(e -> e.getProjectStatusAssess().equals(ColourEnum.GREEN.getValue())).collect(Collectors.toList()); + .filter(e -> ColourEnum.GREEN.getValue().equals(e.getProjectStatusAssess())).collect(Collectors.toList()); List blue = result.stream() - .filter(e -> e.getProjectStatusAssess().equals(ColourEnum.BLUE.getValue())).collect(Collectors.toList()); + .filter(e -> ColourEnum.BLUE.getValue().equals(e.getProjectStatusAssess())).collect(Collectors.toList()); if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { //正序 List collect = result.stream() .filter(e -> StringUtils.isBlank(e.getProjectStatusAssess())).collect(Collectors.toList()); - list.addAll(collect); + blue.addAll(collect); list.addAll(green); list.addAll(yellow); list.addAll(red); @@ -532,13 +532,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl collect = result.stream() + .filter(e -> StringUtils.isBlank(e.getProjectStatusAssess())).collect(Collectors.toList()); + blue.addAll(collect); list.addAll(blue); list.addAll(red); list.addAll(yellow); list.addAll(green); - List collect = result.stream() - .filter(e -> StringUtils.isBlank(e.getProjectStatusAssess())).collect(Collectors.toList()); - list.addAll(collect); + } } if(ObjectUtils.isEmpty(list)){