From 2536b86b3ff29982a18ab5f4b9fd04e3308449d9 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 10 Dec 2021 17:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectDistributionAnalysisRightResultDTO.java  | 13 ++++---------
 .../com/epmet/service/impl/ProjectServiceImpl.java  | 11 ++++-------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java
index 5b52084e9d..fb56a9f178 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java
@@ -19,23 +19,18 @@ public class ProjectDistributionAnalysisRightResultDTO implements Serializable {
     /**
      * ..以上
      */
-    private String under;
+    private Integer under;
 
-    /**
-     * 中间区间
-     */
-    private String middle;
     /**
      * ..以下
      */
-    private String above;
+    private Integer above;
 
     private List<ProjectDistributionAnalysisRightDTO> list;
 
     public ProjectDistributionAnalysisRightResultDTO() {
-        this.under = "";
-        this.middle = "";
-        this.above = "";
+        this.under = null;
+        this.above = null;
         this.list = new ArrayList<>();
     }
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 22cceba501..13b710ec7f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -2830,7 +2830,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 * 分段规则
 	 * 组织内所有网格项目数，网格内最低项目数向下十位取整数，网格内最高项目数向上取整数，获得取值范围，
 	 *
-	 * 根据：
+	 * 根据： 采用这个公式
 	 * 最小取值+（最大取值-最小取值）/3
 	 * 最小取值+（最大取值-最小取值）*2/3
 	 * 获得两个数值，用两个数值确定三个取值范围，
@@ -2886,14 +2886,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		Integer max = Collections.max(allCount);
 		Integer min = Collections.min(allCount);
 		if (orgList.size() == NumConstant.ONE || max.compareTo(min) == NumConstant.ZERO){
-			result.setUnder(orgList.get(NumConstant.ZERO).getCount().toString());
+			result.setUnder(orgList.get(NumConstant.ZERO).getCount());
 			return result;
 		}
-		Integer minRange = min + ((max - min) / NumConstant.THREE);
-		Integer maxRange = min + ((max - min) * NumConstant.TWO / NumConstant.THREE);
-		result.setUnder(minRange.toString().concat("以下"));
-		result.setMiddle(minRange.toString().concat("-").concat(maxRange.toString()));
-		result.setAbove(maxRange.toString().concat("以上"));
+		result.setUnder(min + ((max - min) / NumConstant.THREE));
+		result.setAbove(min + ((max - min) * NumConstant.TWO / NumConstant.THREE));
 		return result;
 	}