From d43182504e687863e38d43776d1adf6907333d22 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Tue, 9 May 2023 16:41:04 +0800
Subject: [PATCH] =?UTF-8?q?UAT197=E6=9D=A1=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1-=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryBaseServiceImpl.java   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

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 a88294b8d..0e3d4a4fc 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
@@ -1874,6 +1874,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				}
 			}
 			if(CollectionUtils.isNotEmpty(dataList)){
+				this.projectDetailsStatisticsGroupByTerritoryHearSort(dataList,params);
 				result.put("dataList",dataList);
 				return result;
 			}
@@ -2035,11 +2036,50 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 					dataList.add(dataMap);
 				}
 			}
+			this.projectDetailsStatisticsGroupByTerritoryHearSort(dataList,params);
 			result.put("dataList",dataList);
 		}
 		return result;
 	}
 
+	/**
+	 * 项目库详情统计-根据责任领域分组统计数据-表头排序
+	 * @param dataList
+	 * @param params
+	 */
+	private void projectDetailsStatisticsGroupByTerritoryHearSort(List<Map<String, Object>> dataList,Map<String,Object> params) {
+		String orderByField = (String) params.get("orderByField");
+		String orderBy = (String) params.get("orderBy");
+		if(CollectionUtils.isNotEmpty(dataList) && StringUtils.isNotEmpty(orderByField) && StringUtils.isNotEmpty(orderBy)){
+			Collator comparator = Collator.getInstance(Locale.CHINESE);
+			Collections.sort(dataList,(data1,data2)->{
+				String param1 = "";
+				String param2 = "";
+				// 一级责任领域名称
+				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("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")) : "";
+				}
+				// 占比
+				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);
+				}
+				return 0;
+			});
+		}
+	}
+
 	@Override
 	public void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params) {
 		Map<String, Object> projectDetailsStatisticsGroupByTerritory = getProjectDetailsStatisticsGroupByTerritory(params);