From adbc45f760913b8cb659cc667d1e39f3f001e96f Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Tue, 18 Apr 2023 15:28:01 +0800
Subject: [PATCH] =?UTF-8?q?UAT=2081=E6=9D=A1=E3=80=82=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index e2fec6d61..43d6398f5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -1439,6 +1439,24 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					});
 				}
 			}
+
+			// WVTA ID wvtaId
+			if(StringUtils.equals("wvtaId",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : "");
+						String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : "");
+						return comparator.compare(e1WvtaId,e2WvtaId);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : "");
+						String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : "");
+						return comparator.compare(e2WvtaId,e1WvtaId);
+					});
+				}
+			}
+
 			// 标准编号 serialNumber
 			if(StringUtils.equals("serialNumber",orderByField)){
 				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
@@ -1456,6 +1474,57 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 			}
 
+			// 责任领域 dutyTerritoryName
+			if(StringUtils.equals("dutyTerritoryName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : "");
+						String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : "");
+						return comparator.compare(e1DutyTerritoryName,e2DutyTerritoryName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : "");
+						String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : "");
+						return comparator.compare(e2DutyTerritoryName,e1DutyTerritoryName);
+					});
+				}
+			}
+
+			// 工程接口人 sdtName
+			if(StringUtils.equals("sdtName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : "");
+						String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : "");
+						return comparator.compare(e1SdtName,e2SdtName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : "");
+						String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : "");
+						return comparator.compare(e2SdtName,e1SdtName);
+					});
+				}
+			}
+
+			// 责任人 dutyPersonName
+			if(StringUtils.equals("dutyPersonName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : "");
+						String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : "");
+						return comparator.compare(e1DutyPersonName,e2DutyPersonName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : "");
+						String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : "");
+						return comparator.compare(e2DutyPersonName,e1DutyPersonName);
+					});
+				}
+			}
+
 			// 交付物类型 deliverableTypeName
 			if(StringUtils.equals("deliverableTypeName",orderByField)){
 				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){