From 8f730394138d04510aebf678f630c607ef788da4 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 16 Sep 2021 14:35:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/util/Pinyin4jUtil.java              | 2 --
 1 file changed, 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
index a3e42f4280..05295879a0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
@@ -42,7 +42,6 @@ public class Pinyin4jUtil {
      */
     public static String getFirstSpellPinYin(String src, boolean isFullSpell) {
         String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, 1));
-        System.out.println(targetStr);
         String[] split = targetStr.split(",");
         if (split.length > 1) {
             targetStr = split[0];
@@ -59,7 +58,6 @@ public class Pinyin4jUtil {
      */
     public static String getSpellPinYin(String src, boolean isFullSpell,Integer preFont) {
         String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, preFont));
-        System.out.println(targetStr);
         String[] split = targetStr.split(",");
         if (split.length > 1) {
             targetStr = split[0];

From 2dafaba625ee0a12b342439b5dc4b8d675b45ced Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 16 Sep 2021 15:01:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E5=8A=A8=E5=A4=9A=E9=9F=B3?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/util/Pinyin4jUtil.java               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
index 05295879a0..c376147122 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
@@ -31,6 +31,7 @@ public class Pinyin4jUtil {
         duoyinMap.put('均',new String[]{"jun"});
         duoyinMap.put('会', new String[]{"hui"});
         duoyinMap.put('属', new String[]{"shu"});
+        duoyinMap.put('调', new String[]{"diao"});
     }
 
     /**

From 455382c55a47e41092970b24f80056d5b0af890d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 16 Sep 2021 15:35:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E3=80=90?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=8E=92=E5=90=8D=E3=80=91=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E4=B8=8B=E6=8E=92=E5=90=8D=E3=80=81=E5=AE=A2=E6=88=B7=E4=B8=8B?=
 =?UTF-8?q?=E6=8E=92=E5=90=8D=EF=BC=8C=E5=90=8D=E6=AC=A1=E6=96=AD=E5=B1=82?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BizPointTotalDetailServiceImpl.java  | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index 95d4bd33df..78d6fd7c81 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -311,7 +311,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
         }
 
         // 4.排名填充。有积分的按照积分排序，分数一样的名次一样
-        Integer ranking = page.getStartRow() + 1;
+        Integer ranking = getStartRanking(rankingInfoDTOs, searchScopeType.getScopeType(), searchScopeId);
         Integer prevPoint = null;
         for (GroupPointRankingResultDTO g : rankingInfoDTOs) {
             Integer point = Integer.valueOf(g.getPoint());
@@ -322,13 +322,42 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
 
             GridInfoCache gridInfo = getGridInfo(g.getGridId());
             g.setGridId(g.getGridId());
-            g.setGridNamePath(gridInfo.getGridNamePath());
+            if (gridInfo != null) {
+                g.setGridNamePath(gridInfo.getGridNamePath());
+            } else {
+                // todo 网格被删除了，应该怎么办？
+                g.setGridNamePath(" ");
+            }
             g.setRanking(String.valueOf(ranking));
             prevPoint = point;
         }
         return rankingInfoDTOs;
     }
 
+    /**
+     * @description 获取起始排名
+     *
+     * @param points 积分信息分页列表
+     * @return
+     * @author wxz
+     * @date 2021.09.16 14:50:11
+     */
+    private Integer getStartRanking(List<GroupPointRankingResultDTO> points, String scopeType, String scopeObjectId) {
+        if (CollectionUtils.isEmpty(points)) {
+            return 0;
+        }
+
+        GroupPointRankingResultDTO firstPoint = points.get(0);
+
+        if (firstPoint.getPoint().equals("0")) {
+            // 如果第一条积分就是0，那么查询出来有积分的组的最低名次+1（注意：point_total表不能有积分为0的记录，否则计算出来的名次会比实际名次+1）
+            Integer minRanking = baseDao.getMinRanking("group", scopeType, scopeObjectId);
+            return minRanking + 1;
+        } else {
+            return baseDao.getRanking("group", firstPoint.getGroupId(), scopeType);
+        }
+    }
+
     /**
      * @description 获取分页缺口group ranking信息
      *