From f5f25a95c7b1ffb29eec306e252fe26afb73a44c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 23 Dec 2022 11:12:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95--=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    |  8 +++++++
 .../ProjectTaskInventoryEOServiceImpl.java    | 21 ++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

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<ProjectLawsIn
 					.filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.REG_ENG_REJECTED.getName())).collect(Collectors.toList());
 			List<ProjectLawsInventoryEO> homoEngRejected = dummyInventoryInfoEOList.stream()
 					.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)) {
 				//正序
 				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<ProjectLawsIn
 				//倒序
 				list.addAll(homoEngRejected);
 				list.addAll(regEngRejected);
+				list.addAll(rejected);
 				list.addAll(accepted);
 				list.addAll(homoEngToConfirm);
 				list.addAll(regEngToConfirm);
+				list.addAll(listToConfirm);
 				list.addAll(notStarted);
 			}
 		}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index e6cb3cdfc..b722bc011 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -333,11 +333,11 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			if("certificationProgressName".equals(orderByField)){
 				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
 					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)){
 					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) {
 		if(ObjectUtils.isNotEmpty(orderByField) && "projectStatusAssess".equals(orderByField)){
 			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()
-					.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()
-					.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()
-					.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<ProjectTaskInventoryEO> 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<ProjectTaskIn
 
 			} 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(red);
 				list.addAll(yellow);
 				list.addAll(green);
-				List<ProjectTaskInventoryEO> collect = result.stream()
-						.filter(e -> StringUtils.isBlank(e.getProjectStatusAssess())).collect(Collectors.toList());
-				list.addAll(collect);
+
 			}
 		}
 		if(ObjectUtils.isEmpty(list)){