先进党员排行接口修改

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);
 }

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;
     }

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>