From b68d7062be16856cb2bd1edbed7fc7fec0939f72 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 25 Feb 2021 18:46:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=BF=9B=E5=85=9A=E5=91=98=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenPartyUserRankDataDao.java       |  2 ++
 .../screen/impl/PartyMemberLeadServiceImpl.java  |  8 +++++++-
 .../mapper/screen/ScreenPartyUserRankDataDao.xml | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java
index 0f442931b5..5a22e7511b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java
@@ -71,4 +71,6 @@ public interface ScreenPartyUserRankDataDao{
      * @author sun
      */
     List<PartIndexScroeRankResultDTO> selectPartymemberPointList(PartIndexScroeRankFormDTO formDTO);
+
+    List<PartyUserPointResultDTO> selectPartymemberPointOrderByAreaCode(@Param("areaCode") String areaCode);
 }
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java
index 5a125e55cd..ce075165b6 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java
@@ -319,7 +319,13 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
     public List<PartyUserPointResultDTO> advancedPartymemberRank(AgencyAndNumFormDTO param) {
         if(null == param.getTopNum()) param.setTopNum(NumConstant.TEN);
         PageHelper.startPage(NumConstant.ONE,param.getTopNum());
-        List<PartyUserPointResultDTO> result = screenPartyUserRankDataDao.selectPartymemberPointOrder(param.getAgencyId());
+        List<PartyUserPointResultDTO> result=new ArrayList<>();
+        if(StringUtils.isNotBlank(param.getAreaCode())){
+            log.info("先进排行榜单-先进党员排行按照areaCode查询入参："+param.getAreaCode());
+            result=screenPartyUserRankDataDao.selectPartymemberPointOrderByAreaCode(param.getAreaCode());
+        }else{
+            result=screenPartyUserRankDataDao.selectPartymemberPointOrder(param.getAgencyId());
+        }
         if(null == result) return new ArrayList<>();
         return result;
     }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index ed4cf4c4d1..525d52f207 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -98,4 +98,20 @@
         LIMIT #{topNum}
     </select>
 
+    <select id="selectPartymemberPointOrderByAreaCode" resultType="com.epmet.evaluationindex.screen.dto.result.PartyUserPointResultDTO">
+        SELECT
+                m.USER_ID,
+                concat( m.surname, CASE char_length( m.NAME ) WHEN 1 THEN '*' WHEN 2 THEN '**' ELSE '***' END )  AS name,
+                m.POINT_TOTAL AS point
+        FROM
+                screen_party_user_rank_data m
+        left join screen_customer_grid scg
+        on(m.GRID_ID=scg.GRID_ID and scg.DEL_FLAG='0')
+        WHERE
+                m.DEL_FLAG = '0'
+                AND PARTY_FLAG = '1'
+                and scg.AREA_CODE like CONCAT(#{areaCode},'%')
+        ORDER BY
+                m.POINT_TOTAL DESC
+    </select>
 </mapper>
\ No newline at end of file