From bbb0ccd043f85709e4a853193193d6c32f6708f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 14 Jun 2023 18:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryBaseServiceImpl.java   | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index f75e0937c..789ed45b1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -2064,21 +2064,31 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				if("dutyTerritoryName".equals(orderByField)){
 					param1 = StringUtils.isNotEmpty((String) data1.get("dutyTerritoryName")) ? (String) data1.get("dutyTerritoryName") : "";
 					param2 = StringUtils.isNotEmpty((String) data2.get("dutyTerritoryName")) ? (String) data2.get("dutyTerritoryName") : "";
+					if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return comparator.compare(param1,param2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return comparator.compare(param2,param1);
+					}
 				}
 				// 数量
 				if("amount".equals(orderByField)){
-					param1 = StringUtils.isNotEmpty(String.valueOf(data1.get("amount"))) ? String.valueOf(data1.get("amount")) : "";
-					param2 = StringUtils.isNotEmpty(String.valueOf(data2.get("amount"))) ? String.valueOf(data2.get("amount")) : "";
+					double p1 = data1.get("amount") != null ? (double) data1.get("amount") : 0;
+					double p2 = data2.get("amount") != null ? (double) data2.get("amount") : 0;
+					if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return (int)(p1 - p2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return (int)(p2 - p1);
+					}
 				}
 				// 占比
 				if("percentage".equals(orderByField)){
-					param1 = StringUtils.isNotEmpty((String) data1.get("percentage")) ? (String) data1.get("percentage") : "";
-					param2 = StringUtils.isNotEmpty((String) data2.get("percentage")) ? (String) data2.get("percentage") : "";
-				}
-				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
-					return comparator.compare(param1,param2);
-				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
-					return comparator.compare(param2,param1);
+					double p1 = StringUtils.isNotEmpty((String) data1.get("percentage")) ? Double.parseDouble (((String) data1.get("percentage")).replace("%","")) : 0;
+					double p2 = StringUtils.isNotEmpty((String) data2.get("percentage")) ? Double.parseDouble (((String) data2.get("percentage")).replace("%","")) : 0;
+					if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return (int)(p1 - p2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return (int)(p2 - p1);
+					}
 				}
 				return 0;
 			});