WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务清单--表头排序修改

Browse Source
This commit is contained in:
zhn
2022-12-23 11:12:31 +08:00
parent 3cc7e7aaad
commit f5f25a95c7
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+8
View File
@@ -991,14 +991,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.REG_ENG_REJECTED.getName())).collect(Collectors.toList()); .filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.REG_ENG_REJECTED.getName())).collect(Collectors.toList());
List<ProjectLawsInventoryEO> homoEngRejected = dummyInventoryInfoEOList.stream() List<ProjectLawsInventoryEO> homoEngRejected = dummyInventoryInfoEOList.stream()
.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.HOMO_ENG_REJECTED.getName())).collect(Collectors.toList()); .filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.HOMO_ENG_REJECTED.getName())).collect(Collectors.toList());
List<ProjectLawsInventoryEO> listToConfirm = dummyInventoryInfoEOList.stream()
.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getName())).collect(Collectors.toList());
List<ProjectLawsInventoryEO> rejected = dummyInventoryInfoEOList.stream()
.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.REJECTED.getName())).collect(Collectors.toList());
if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
//正序 //正序
list.addAll(notStarted); list.addAll(notStarted);
list.addAll(listToConfirm);
list.addAll(regEngToConfirm); list.addAll(regEngToConfirm);
list.addAll(homoEngToConfirm); list.addAll(homoEngToConfirm);
list.addAll(accepted); list.addAll(accepted);
list.addAll(rejected);
list.addAll(regEngRejected); list.addAll(regEngRejected);
list.addAll(homoEngRejected); list.addAll(homoEngRejected);
@@ -1006,9 +1012,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//倒序 //倒序
list.addAll(homoEngRejected); list.addAll(homoEngRejected);
list.addAll(regEngRejected); list.addAll(regEngRejected);
list.addAll(rejected);
list.addAll(accepted); list.addAll(accepted);
list.addAll(homoEngToConfirm); list.addAll(homoEngToConfirm);
list.addAll(regEngToConfirm); list.addAll(regEngToConfirm);
list.addAll(listToConfirm);
list.addAll(notStarted); list.addAll(notStarted);
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+11 -10
View File
@@ -333,11 +333,11 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
if("certificationProgressName".equals(orderByField)){ if("certificationProgressName".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(result,(e1, e2)->{ Collections.sort(result,(e1, e2)->{
return comparator.compare(e1.getCertificationProgressName(),e2.getCertificationProgressName()); return comparator.compare(e2.getCertificationProgressName(),e1.getCertificationProgressName());
}); });
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(result,(e1,e2)->{ 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<ProjectTaskIn
List<ProjectTaskInventoryEO> list) { List<ProjectTaskInventoryEO> list) {
if(ObjectUtils.isNotEmpty(orderByField) && "projectStatusAssess".equals(orderByField)){ if(ObjectUtils.isNotEmpty(orderByField) && "projectStatusAssess".equals(orderByField)){
List<ProjectTaskInventoryEO> red = result.stream() List<ProjectTaskInventoryEO> 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<ProjectTaskInventoryEO> yellow = result.stream() List<ProjectTaskInventoryEO> 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<ProjectTaskInventoryEO> green = result.stream() List<ProjectTaskInventoryEO> 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<ProjectTaskInventoryEO> blue = result.stream() List<ProjectTaskInventoryEO> 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)) { if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
//正序 //正序
List<ProjectTaskInventoryEO> collect = result.stream() List<ProjectTaskInventoryEO> collect = result.stream()
.filter(e -> StringUtils.isBlank(e.getProjectStatusAssess())).collect(Collectors.toList()); .filter(e -> StringUtils.isBlank(e.getProjectStatusAssess())).collect(Collectors.toList());
list.addAll(collect); blue.addAll(collect);
list.addAll(green); list.addAll(green);
list.addAll(yellow); list.addAll(yellow);
list.addAll(red); list.addAll(red);
@@ -532,13 +532,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
} else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) {
//倒序 //倒序
List<ProjectTaskInventoryEO> collect = result.stream()
.filter(e -> StringUtils.isBlank(e.getProjectStatusAssess())).collect(Collectors.toList());
blue.addAll(collect);
list.addAll(blue); list.addAll(blue);
list.addAll(red); list.addAll(red);
list.addAll(yellow); list.addAll(yellow);
list.addAll(green); list.addAll(green);
List<ProjectTaskInventoryEO> collect = result.stream()
.filter(e -> StringUtils.isBlank(e.getProjectStatusAssess())).collect(Collectors.toList());
list.addAll(collect);
} }
} }
if(ObjectUtils.isEmpty(list)){ if(ObjectUtils.isEmpty(list)){