Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartIndexScroeRankFormDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.evaluationindex.screen.dto.form;
+
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *  党员（指标得分）排行--接口入参
+ * @Author sun
+ */
+@Data
+public class PartIndexScroeRankFormDTO implements Serializable {
+    private static final long serialVersionUID = -2880432640584616651L;
+    /**
+     * 组织或网格Id
+     */
+    @NotBlank(message = "组织或网格ID不能为空",groups = {PartIndexScroeRankFormDTO.AddUserInternalGroup.class})
+    private String orgId;
+    /**
+     * 类型（组织：agency  网格：grid）
+     */
+    @NotBlank(message = "数据类型不能为空",groups = {PartIndexScroeRankFormDTO.AddUserInternalGroup.class})
+    private String orgType;
+    /**
+     * 默认显示前5名
+     */
+    @Min(value = 1, message = "查询条数必须大于0", groups = {PartIndexScroeRankFormDTO.AddUserInternalGroup.class })
+    private Integer topNum;
+    public interface AddUserInternalGroup {}
+
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserPointRankFormDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.evaluationindex.screen.dto.form;
+
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *  热心市民积分排行列表--接口入参
+ * @Author sun
+ */
+@Data
+public class UserPointRankFormDTO implements Serializable {
+    private static final long serialVersionUID = -2880432640584616651L;
+    /**
+     * 组织或网格Id
+     */
+    @NotBlank(message = "组织或网格ID不能为空",groups = {UserPointRankFormDTO.AddUserInternalGroup.class})
+    private String orgId;
+    /**
+     * 类型（组织：agency  网格：grid）
+     */
+    @NotBlank(message = "数据类型不能为空",groups = {UserPointRankFormDTO.AddUserInternalGroup.class})
+    private String orgType;
+    /**
+     * 默认显示前5名
+     */
+    @Min(value = 1, message = "查询条数必须大于0", groups = {UserPointRankFormDTO.AddUserInternalGroup.class })
+    private Integer topNum;
+    public interface AddUserInternalGroup {}
+
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartIndexScroeRankResultDTO.java

@@ -0,0 +1,45 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  党员（指标得分）排行--接口返参
+ * @Author sun
+ */
+@Data
+public class PartIndexScroeRankResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 组织ID
+     */
+    private String agencyId;
+    /**
+     * 组织名称
+     */
+    private String agencyName;
+    /**
+     * 用户Id
+     */
+    private String userId;
+    /**
+     * 用户名称
+     */
+    private String userName;
+    /**
+     * 网格Id
+     */
+    private String gridId;
+    /**
+     * 网格名称
+     */
+    private String gridName;
+    /**
+     * 党员指标得分
+     */
+    private Integer indexScore;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserPointRankListResultDTO.java

@@ -0,0 +1,46 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *  热心市民积分排行列表--接口返参
+ * @Author sun
+ */
+@Data
+public class UserPointRankListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3860268744336541373L;
+
+    /**
+     * 组织ID
+     */
+    private String agencyId;
+    /**
+     * 组织名称
+     */
+    private String agencyName;
+    /**
+     * 用户Id
+     */
+    private String userId;
+    /**
+     * 用户名称
+     */
+    private String userName;
+    /**
+     * 网格Id
+     */
+    private String gridId;
+    /**
+     * 网格名称
+     */
+    private String gridName;
+    /**
+     * 用户积分
+     */
+    private Integer pointTotal;
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java

@@ -33,7 +33,6 @@ public class FactIndexController {
      * @Description 能力指数
      * @author sun
      */
-    @InternalAppRequestAuth
     @PostMapping("index/ablityindex")
     public Result<List<AblityIndexResultDTO>> ablityIndex(@LoginUser TokenDto tokenDTO, @RequestBody AblityIndexFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AblityIndexFormDTO.AddUserInternalGroup.class);
@@ -45,7 +44,6 @@ public class FactIndexController {
      * @Description 按月份查询各项能力分数
      * @author sun
      */
-    @InternalAppRequestAuth
     @PostMapping("index/scorelist")
     public Result<List<ScoreListResultDTO>> scoreList(@LoginUser TokenDto tokenDTO, @RequestBody ScoreListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ScoreListFormDTO.AddUserInternalGroup.class);
@@ -57,7 +55,6 @@ public class FactIndexController {
      * @Description 按月份查询各项能力最近12个月得分
      * @author sun
      */
-    @InternalAppRequestAuth
     @PostMapping("index/monthscorelist")
     public Result<List<MonthScoreListResultDTO>> monthScoreList(@LoginUser TokenDto tokenDTO, @RequestBody MonthScoreListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, MonthScoreListFormDTO.AddUserInternalGroup.class);
@@ -69,7 +66,6 @@ public class FactIndexController {
      * @Description 按月查询各项指标数据
      * @author sun
      */
-    @InternalAppRequestAuth
     @PostMapping("index/ablitylist")
     public Result<List<AblityListResultDTO>> ablityList(@LoginUser TokenDto tokenDTO, @RequestBody AblityListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AblityListFormDTO.AddUserInternalGroup.class);
@@ -81,7 +77,6 @@ public class FactIndexController {
      * @Description 按月查询各项指标最近12个月数据
      * @author sun
      */
-    @InternalAppRequestAuth
     @PostMapping("index/monthablitylist")
     public Result<List<MonthAblityListResultDTO>> monthAblityList(@LoginUser TokenDto tokenDTO, @RequestBody MonthAblityListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, MonthAblityListFormDTO.AddUserInternalGroup.class);
@@ -93,7 +88,6 @@ public class FactIndexController {
      * @Description 同级对比各项数据查询
      * @author sun
      */
-    @InternalAppRequestAuth
     @PostMapping("index/peercomparison")
     public Result<List<PeerComparisonResultDTO>> peerComparison(@LoginUser TokenDto tokenDTO, @RequestBody PeerComparisonFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, PeerComparisonFormDTO.AddUserInternalGroup.class);
@@ -105,7 +99,6 @@ public class FactIndexController {
      * @Description 是否根组织
      * @author sun
      */
-    @InternalAppRequestAuth
     @PostMapping("index/rootagency")
     public Result<RootAgencyResultDTO> rootAgency(@LoginUser TokenDto tokenDTO, @RequestBody RootAgencyFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, RootAgencyFormDTO.AddUserInternalGroup.class);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java

@@ -43,7 +43,6 @@ public class KcScreenController {
      * @Description  首页-平台各类总数
      * @author sun
      */
-    @ExternalAppRequestAuth
     @PostMapping("homepage/summary")
     public Result<HomepageSummaryResultDTO> homepageSummary(ExternalAppRequestParam externalAppRequestParam){
         return new Result<HomepageSummaryResultDTO>().ok(kcScreenService.homepageSummary(externalAppRequestParam));
@@ -54,7 +53,6 @@ public class KcScreenController {
      * @Description  公益互助-各类总数汇总
      * @author sun
      */
-    @ExternalAppRequestAuth
     @PostMapping("heart/summary")
     public Result<HeartSummaryResultDTO> heartSummary(ExternalAppRequestParam externalAppRequestParam){
         return new Result<HeartSummaryResultDTO>().ok(kcScreenService.heartSummary(externalAppRequestParam));
@@ -65,7 +63,6 @@ public class KcScreenController {
      * @Description  公益互助-公益活动次数
      * @author sun
      */
-    @ExternalAppRequestAuth
     @PostMapping("heart/actcounttrend")
     public Result<HeartActcounttrendResultDTO> heartActcounttrend(ExternalAppRequestParam externalAppRequestParam){
         return new Result<HeartActcounttrendResultDTO>().ok(kcScreenService.heartActcounttrend(externalAppRequestParam));
@@ -75,8 +72,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
-    @InternalAppRequestAuth
     @PostMapping("issue/summary")
     public Result getIssueSummary(ExternalAppRequestParam externalAppRequestParam) {
         String customerId = externalAppRequestParam.getCustomerId();
@@ -90,7 +85,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("issue/partitrend")
     public Result getIssuePartiTrend(ExternalAppRequestParam externalAppRequestParam) {
         String customerId = externalAppRequestParam.getCustomerId();
@@ -104,7 +98,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("issue/gridtotalrank")
     public Result getIssueGridTotalRank(ExternalAppRequestParam externalAppRequestParam) {
         String customerId = externalAppRequestParam.getCustomerId();
@@ -117,7 +110,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("issue/avgaudittimerank")
     public Result getAvgAuditTimeRank(ExternalAppRequestParam externalAppRequestParam) {
         String customerId = externalAppRequestParam.getCustomerId();
@@ -130,7 +122,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("issue/effective")
     public Result getIssueEffective(ExternalAppRequestParam externalAppRequestParam) {
         String customerId = externalAppRequestParam.getCustomerId();
@@ -144,7 +135,6 @@ public class KcScreenController {
      * @Description  公益互助-志愿者画像
      * @author sun
      */
-    @ExternalAppRequestAuth
     @PostMapping("heart/volunteerportrayal")
     public Result<HeartVolunteerportrayalResultDTO> heartVolunteerportrayal(ExternalAppRequestParam externalAppRequestParam){
         return new Result<HeartVolunteerportrayalResultDTO>().ok(kcScreenService.heartVolunteerportrayal(externalAppRequestParam));
@@ -155,7 +145,6 @@ public class KcScreenController {
      * @Description  公益互助-个人（志愿者）公益时长排名
      * @author sun
      */
-    @ExternalAppRequestAuth
     @PostMapping("heart/volunteerrank")
     public Result<List<HeartVolunteerrankResultDTO>> heartVolunteerrank(ExternalAppRequestParam externalAppRequestParam, @RequestBody HeartVolunteerrankFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, HeartVolunteerrankFormDTO.AddUserInternalGroup.class);
@@ -169,7 +158,6 @@ public class KcScreenController {
      * @Description  邻里党群-各类总数
      * @author sun
      */
-    @ExternalAppRequestAuth
     @PostMapping("group/summary")
     public Result<GroupSummaryResultDTO> groupSummary(ExternalAppRequestParam externalAppRequestParam){
         return new Result<GroupSummaryResultDTO>().ok(kcScreenService.groupSummary(externalAppRequestParam));
@@ -180,7 +168,6 @@ public class KcScreenController {
      * @Description  邻里党群-话题参与趋势
      * @author sun
      */
-    @ExternalAppRequestAuth
     @PostMapping("group/partitopictrend")
     public Result<GroupPartitopictrendResultDTO> groupPartitopictrend(ExternalAppRequestParam externalAppRequestParam){
         return new Result<GroupPartitopictrendResultDTO>().ok(kcScreenService.groupPartitopictrend(externalAppRequestParam));
@@ -191,7 +178,6 @@ public class KcScreenController {
      * @Description  邻里党群-社群数量排名
      * @author sun
      */
-    @ExternalAppRequestAuth
     @PostMapping("group/gridgroupcountrank")
     public Result<GroupGridgroupcountrankResultDTO> groupGridgroupcountrank(ExternalAppRequestParam externalAppRequestParam){
         return new Result<GroupGridgroupcountrankResultDTO>().ok(kcScreenService.groupGridgroupcountrank(externalAppRequestParam));
@@ -202,7 +188,6 @@ public class KcScreenController {
      * @Description  邻里党群-社群数量排名
      * @author sun
      */
-    @ExternalAppRequestAuth
     @PostMapping("group/usercountrank")
     public Result<List<GroupUserCountRankResultDTO>> groupUserCountRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody GroupUserCountRankFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, GroupUserCountRankFormDTO.AddUserInternalGroup.class);
@@ -215,7 +200,6 @@ public class KcScreenController {
      * @Description  邻里党群-话题转化率排名
      * @author sun
      */
-    @ExternalAppRequestAuth
     @PostMapping("group/topicshiftissueratiorank")
     public Result<List<GroupTopicShiftIssueRatioRankResultDTO>> groupTopicShiftIssueRatioRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody GroupTopicShiftIssueRatioRankFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, GroupTopicShiftIssueRatioRankFormDTO.AddUserInternalGroup.class);
@@ -228,7 +212,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("project/summary")
     public Result<ProjectSummaryResultDTO> getProjectSummary(ExternalAppRequestParam externalAppRequestParam){
         //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
@@ -241,7 +224,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("project/gridcountrank")
     public Result<GridProjectCountRankResultDTO> getProjectGridCountRank(ExternalAppRequestParam externalAppRequestParam){
         //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
@@ -254,7 +236,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("project/categoryanalysis")
     public Result<List<ProjectCategoryAnalysisResultDTO>> getProjectCategoryAnalysis(ExternalAppRequestParam externalAppRequestParam){
         //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
@@ -267,7 +248,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("project/avgclosedtimeanalysis")
     public Result<List<ProjectAvgClosedTimeResultDTO>> getGridProjectAvgClosedTimeAnalysis(ExternalAppRequestParam externalAppRequestParam){
         //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
@@ -280,7 +260,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("project/statis")
     public Result<ProjectSatisfactionResultDTO> getProjectSatisfactionAnalyze(ExternalAppRequestParam externalAppRequestParam){
         String customerId = externalAppRequestParam.getCustomerId();
@@ -292,7 +271,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("user/summary")
     public Result<UserSummaryResultDTO> getUserSummary(ExternalAppRequestParam externalAppRequestParam){
         String customerId = externalAppRequestParam.getCustomerId();
@@ -305,7 +283,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("user/trend")
     public Result<KcUserTrendResultDTO> getUserTrend(ExternalAppRequestParam externalAppRequestParam){
         String customerId = externalAppRequestParam.getCustomerId();
@@ -317,7 +294,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("user/griduserrank")
     public Result<KcUserRankResultDTO> getUserRank(ExternalAppRequestParam externalAppRequestParam){
         String customerId = externalAppRequestParam.getCustomerId();
@@ -329,7 +305,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("user/userportrayal")
     public Result<KcUserPortrayalResultDTO> getUserPortrayal(ExternalAppRequestParam externalAppRequestParam){
         String customerId = externalAppRequestParam.getCustomerId();
@@ -341,7 +316,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("user/pointsrank")
     public Result<KcUserPointRankResultDTO> getUserPointsRank(ExternalAppRequestParam externalAppRequestParam,
                                                               @RequestBody PageFormDTO form) {
@@ -354,7 +328,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("news/summary")
     public Result<ScreenKcNewsSummaryResultDTO> getNewsSummary(ExternalAppRequestParam externalAppRequestParam){
         String customerId = externalAppRequestParam.getCustomerId();
@@ -366,7 +339,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("news/partitrend")
     public Result<ScreenKcNewsPartiTrendResultDTO> getNewsPartiTrend(ExternalAppRequestParam externalAppRequestParam){
         String customerId = externalAppRequestParam.getCustomerId();
@@ -378,7 +350,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("news/category")
     public Result<List<ScreenKcCategoryNewsCountResultDTO>> getNewsCountGroupByCategory(ExternalAppRequestParam externalAppRequestParam){
         String customerId = externalAppRequestParam.getCustomerId();
@@ -390,7 +361,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("news/userparticategoryrank")
     public Result<ScreenKcCategoryNewsRankResultDTO> getNewsPartiCategoryRank(ExternalAppRequestParam externalAppRequestParam){
         String customerId = externalAppRequestParam.getCustomerId();
@@ -402,7 +372,6 @@ public class KcScreenController {
      * @param externalAppRequestParam
      * @return
      */
-    @ExternalAppRequestAuth
     @PostMapping("news/hotrank")
     public Result<List<ScreenKcNewsHotRankResultDTO>> listNewsHotRank(ExternalAppRequestParam externalAppRequestParam,
                                                                       @RequestBody PageFormDTO form){

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenUserController.java

@@ -0,0 +1,59 @@
+package com.epmet.datareport.controller.screen;
+
+import com.epmet.commons.extappauth.annotation.InternalAppRequestAuth;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.service.evaluationindex.screen.ScreenUserService;
+import com.epmet.evaluationindex.screen.dto.form.PartIndexScroeRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.UserPointRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartIndexScroeRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.UserPointRankListResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 数据改版api
+ *
+ * @author sun
+ */
+@RestController
+@RequestMapping("/screen/user")
+public class ScreenUserController {
+
+    @Autowired
+    private ScreenUserService screenUserService;
+
+    /**
+     * @param tokenDTO
+     * @Description  热心市民积分排行列表
+     * @author sun
+     */
+    @InternalAppRequestAuth
+    @PostMapping("userpointrank")
+    public Result<List<UserPointRankListResultDTO>> userPointRank(@LoginUser TokenDto tokenDTO, @RequestBody UserPointRankFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, UserPointRankFormDTO.AddUserInternalGroup.class);
+        return new Result<List<UserPointRankListResultDTO>>().ok(screenUserService.userPointRank(formDTO));
+    }
+
+    /**
+     * @param tokenDTO
+     * @Description  党员（指标得分）排行
+     * @author sun
+     */
+    @InternalAppRequestAuth
+    @PostMapping("partindexscroerank")
+    public Result<List<PartIndexScroeRankResultDTO>> partIndexScroeRank(@LoginUser TokenDto tokenDTO, @RequestBody PartIndexScroeRankFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PartIndexScroeRankFormDTO.AddUserInternalGroup.class);
+        return new Result<List<PartIndexScroeRankResultDTO>>().ok(screenUserService.partIndexScroeRank(formDTO));
+    }
+
+
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java

@@ -18,7 +18,11 @@
 package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.dto.result.user.KcUserPointRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.form.PartIndexScroeRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.UserPointRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartIndexScroeRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.PartyUserPointResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.UserPointRankListResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.UserPointResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -53,4 +57,18 @@ public interface ScreenPartyUserRankDataDao{
     List<PartyUserPointResultDTO> selectPartymemberPointOrder(@Param("agencyId")String agencyId);
 
     List<KcUserPointRankResultDTO.KcUserPoint> listUserPoints(String customerId);
+
+    /**
+     * @param formDTO
+     * @Description  查询组织下居民积分排行，按积分值降序
+     * @author sun
+     */
+    List<UserPointRankListResultDTO> selectAgencyUserPointList(UserPointRankFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @Description  查询组织下党员的积分排行，按积分值降序
+     * @author sun
+     */
+    List<PartIndexScroeRankResultDTO> selectPartymemberPointList(PartIndexScroeRankFormDTO formDTO);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenUserService.java

@@ -0,0 +1,30 @@
+package com.epmet.datareport.service.evaluationindex.screen;
+
+import com.epmet.evaluationindex.screen.dto.form.PartIndexScroeRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.UserPointRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartIndexScroeRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.UserPointRankListResultDTO;
+
+import java.util.List;
+
+/**
+ * 数据改版
+ *
+ * @author sun
+ */
+public interface ScreenUserService {
+
+    /**
+     * @param formDTO
+     * @Description  热心市民积分排行列表
+     * @author sun
+     */
+    List<UserPointRankListResultDTO> userPointRank(UserPointRankFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @Description  党员（指标得分）排行
+     * @author sun
+     */
+    List<PartIndexScroeRankResultDTO> partIndexScroeRank(PartIndexScroeRankFormDTO formDTO);
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenUserServiceImpl.java

@@ -0,0 +1,61 @@
+package com.epmet.datareport.service.evaluationindex.screen.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.datareport.constant.FactConstant;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventDataDao;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenPartyUserRankDataDao;
+import com.epmet.datareport.service.evaluationindex.screen.ScreenUserService;
+import com.epmet.evaluationindex.screen.dto.form.PartIndexScroeRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.UserPointRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartIndexScroeRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.UserPointRankListResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 数据改版
+ *
+ * @author sun
+ */
+@Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+public class ScreenUserServiceImpl implements ScreenUserService {
+
+    @Autowired
+    private ScreenPartyUserRankDataDao screenPartyUserRankDataDao;
+
+    /**
+     * @param formDTO
+     * @Description 热心市民积分排行列表
+     * @author sun
+     */
+    @Override
+    public List<UserPointRankListResultDTO> userPointRank(UserPointRankFormDTO formDTO) {
+        //1.参数校验
+        if (!FactConstant.AGENCY.equals(formDTO.getOrgType()) && !FactConstant.GRID.equals(formDTO.getOrgType())) {
+            throw new RenException(String.format("入参格式错误,错误的组织或网格类型:%s", formDTO.getOrgType()));
+        }
+        //2.查询组织下居民积分排行，按积分值降序  screen_party_user_rank_data
+        return screenPartyUserRankDataDao.selectAgencyUserPointList(formDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @Description 党员（指标得分）排行
+     * @author sun
+     */
+    @Override
+    public List<PartIndexScroeRankResultDTO> partIndexScroeRank(PartIndexScroeRankFormDTO formDTO) {
+        //1.参数校验
+        if (!FactConstant.AGENCY.equals(formDTO.getOrgType()) && !FactConstant.GRID.equals(formDTO.getOrgType())) {
+            throw new RenException(String.format("入参格式错误,错误的组织或网格类型:%s", formDTO.getOrgType()));
+        }
+        //2.查询组织下党员的积分排行   screen_party_user_rank_data
+        return screenPartyUserRankDataDao.selectPartymemberPointList(formDTO);
+    }
+
+}

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@@ -44,4 +44,58 @@
           and ur.CUSTOMER_ID = #{customerId}
         order by ur.POINT_TOTAL desc
     </select>
+
+    <select id="selectAgencyUserPointList" resultType="com.epmet.evaluationindex.screen.dto.result.UserPointRankListResultDTO">
+        SELECT
+            org_id AS "agencyId",
+            org_name AS "agencyName",
+            grid_id AS "gridId",
+            grid_name AS "gridName",
+            user_id AS "userId",
+            user_name AS "userName",
+            point_total AS "pointTotal"
+        FROM
+            screen_party_user_rank_data
+        WHERE
+            del_flag = '0'
+        <if test="orgType != null and orgType !='' and orgType = 'agency'">
+            <if test="orgType = 'agency'">
+                AND org_id = #{orgId}
+            </if>
+            <if test="orgType = 'grid'">
+                AND grid_id = #{orgId}
+            </if>
+        </if>
+        ORDER BY
+            point_total DESC
+        LIMIT #{topNum}
+    </select>
+
+    <select id="selectPartymemberPointList" resultType="com.epmet.evaluationindex.screen.dto.result.PartIndexScroeRankResultDTO">
+        SELECT
+            org_id AS "agencyId",
+            org_name AS "agencyName",
+            grid_id AS "gridId",
+            grid_name AS "gridName",
+            user_id AS "userId",
+            user_name AS "userName",
+            index_score AS "indexScore"
+        FROM
+            screen_party_user_rank_data
+        WHERE
+            del_flag = '0'
+        AND party_flag = '1'<!-- 是否是党员标志：1是。0不是党员 -->
+        <if test="orgType != null and orgType !='' and orgType = 'agency'">
+            <if test="orgType = 'agency'">
+                AND org_id = #{orgId}
+            </if>
+            <if test="orgType = 'grid'">
+                AND grid_id = #{orgId}
+            </if>
+        </if>
+        ORDER BY
+            point_total DESC
+        LIMIT #{topNum}
+    </select>
+
 </mapper>