4、支部建设情况|联建共建情况-排行

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

@@ -3,6 +3,7 @@ package com.epmet.screen.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description 4、支部建设情况|联建共建情况-排行 返参dto
@@ -14,5 +15,18 @@ import java.io.Serializable;
 public class BranchBuildRankResultDTO implements Serializable {
     private static final long serialVersionUID = 6213072175254509349L;
 
+    /**
+     * 组织次数
+     * */
+    private List<Integer> organizeData;
 
+    /**
+     * 组织名称数组
+     * */
+    private List<String> xAxis;
+
+    /**
+     * 参与人数
+     * */
+    private List<Integer> joinData;
 }

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

@@ -1,5 +1,6 @@
 package com.epmet.screen.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,22 +16,29 @@ public class PartymemberAgeDistributionResultDTO implements Serializable {
     private static final long serialVersionUID = -3477512511475784330L;
 
     /**
-     * 30岁以下 的党员占 注册党员总数的百分比 （返回数字，小数点后保留两位）
+     * 30岁以下 的党员
      * */
-    private String under30Ratio;
+    private Integer under30Count = NumConstant.ZERO;
 
     /**
-     * 31-50岁 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+     * 31-50岁 的党员
      * */
-    private String between31And50Ratio;
+    private Integer between31And50Count = NumConstant.ZERO;
 
     /**
-     * 51-60岁 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+     * 51-60岁 的党员
      * */
-    private String between51And60Ratio;
+    private Integer between51And60Count = NumConstant.ZERO;
 
     /**
-     * 61岁以上 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位）
+     * 61岁以上 的党员
      * */
-    private String above61;
+    private Integer above61Count = NumConstant.ZERO;
+
+    /**
+     * 党员总数
+     * */
+    private Integer partyTotal = NumConstant.ZERO;
+
+
 }

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

@@ -17,7 +17,7 @@
 
 package com.epmet.datareport.dao.screen;
 
-import com.epmet.screen.dto.result.PartymemberAgePercentResultDTO;
+import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -38,7 +38,7 @@ public interface ScreenCpcBaseDataDao{
      * @author wangc
      * @date 2020.08.18 17:47
     **/
-    PartymemberAgePercentResultDTO selectPartymemberAgeDistribution(@Param("agencyId") String agencyId);
+    PartymemberAgeDistributionResultDTO selectPartymemberAgeDistribution(@Param("agencyId") String agencyId);
 
 
 }

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

@@ -1,7 +1,9 @@
 package com.epmet.datareport.service.screen;
 
+import com.epmet.screen.dto.form.BranchBuildRankFormDTO;
 import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
 import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.result.BranchBuildRankResultDTO;
 import com.epmet.screen.dto.result.BranchBuildTrendResultDTO;
 import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO;
 import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
@@ -43,4 +45,14 @@ public interface GrassrootsPartyDevService {
      * @date 2020.08.19 11:02
     **/
     BranchBuildTrendResultDTO branchBuildTrend(BranchBuildTrendFormDTO param);
+
+    /**
+     * @Description 4、支部建设情况|联建共建情况-排行
+     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321982
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.19 15:25
+    **/
+    BranchBuildRankResultDTO branchBuildRank(BranchBuildRankFormDTO param);
 }

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

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao;
 import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao;
 import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
+import com.epmet.screen.dto.form.BranchBuildRankFormDTO;
 import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
 import com.epmet.screen.dto.form.ParymemberFormDTO;
 import com.epmet.screen.dto.result.*;
@@ -76,22 +77,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
      **/
     @Override
     public PartymemberAgeDistributionResultDTO partymemberAgeDistribution(ParymemberFormDTO param) {
-        PartymemberAgePercentResultDTO percent = screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId());
-        PartymemberAgeDistributionResultDTO result = new PartymemberAgeDistributionResultDTO();
-
-        if(null == percent.getUnder30Ratio()) percent.setUnder30Ratio(new BigDecimal(NumConstant.ZERO));
-        result.setUnder30Ratio(convertPercentStr(percent.getUnder30Ratio()));
-
-        if(null == percent.getBetween31And50Ratio()) percent.setBetween31And50Ratio(new BigDecimal(NumConstant.ZERO));
-        result.setBetween31And50Ratio(convertPercentStr(percent.getBetween31And50Ratio()));
-
-        if(null == percent.getBetween51And60Ratio()) percent.setBetween51And60Ratio(new BigDecimal(NumConstant.ZERO));
-        result.setBetween51And60Ratio(convertPercentStr(percent.getBetween51And60Ratio()));
-
-        if(null == percent.getAbove61()) percent.setAbove61(new BigDecimal(NumConstant.ZERO));
-        result.setAbove61(convertPercentStr(percent.getAbove61()));
-
-        return result;
+       return screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId());
     }
 
     /**
@@ -159,6 +145,20 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
         result.setSeriesData(dataArray);
         result.setLegend(null == result.getLegend() ? new ArrayList<>() : result.getLegend());
 
+        return result;
+    }
+
+    /**
+     * @Description 4、支部建设情况|联建共建情况-排行
+     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321982
+     * @param param
+     * @return BranchBuildRankResultDTO
+     * @author wangc
+     * @date 2020.08.19 15:25
+     **/
+    @Override
+    public BranchBuildRankResultDTO branchBuildRank(BranchBuildRankFormDTO param) {
+
         return null;
     }
 

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

@@ -4,12 +4,13 @@
 <mapper namespace="com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao">
 
     <!-- 查询党员年龄分布情况 -->
-    <select id="selectPartymemberAgeDistribution" resultType="com.epmet.screen.dto.result.PartymemberAgePercentResultDTO">
+    <select id="selectPartymemberAgeDistribution" resultType="com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO">
         SELECT
-            SUM( AGE_LEVEL_1 ) + SUM( AGE_LEVEL_2 ) AS under30Ratio,
-            SUM( AGE_LEVEL_3 ) + SUM( AGE_LEVEL_4 ) AS between31And50Ratio,
-            SUM( AGE_LEVEL_5 ) AS between51And60Ratio,
-            SUM( AGE_LEVEL_6 ) AS above61
+            SUM( AGE_LEVEL_1 ) + SUM( AGE_LEVEL_2 ) AS under30Count,
+            SUM( AGE_LEVEL_3 ) + SUM( AGE_LEVEL_4 ) AS between31And50Count,
+            SUM( AGE_LEVEL_5 ) AS between51And60Count,
+            SUM( AGE_LEVEL_6 ) AS above61Count,
+            SUM( PARTY_MEMBER_COUNT) AS partyTotal
         FROM
             screen_cpc_base_data
         WHERE

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

@@ -38,4 +38,30 @@
             ISSUE_CATEGORY_NAME
     </select>
 
+    <select id="selectBranchDataByType">
+        SELECT
+            ORG_NAME,
+            COUNT( ORGANIZE_COUNT ) AS organizeData,
+            COUNT( JOIN_USER_COUNT ) AS joinData
+        FROM
+            screen_party_branch_data
+        <where>
+            DEL_FLAG = '0'
+            AND ORG_TYPE = 'agency'
+            AND ORG_ID = #{agencyId}
+            AND TYPE = #{category}
+                <!-- 指定月的排行 -->
+                <if test='null != monthId and "" != monthId'>
+                    AND MONTH_ID = #{monthId}
+                </if>
+                <if test='null != bottomMonthId and "" != bottomMonthId'>
+                    AND MONTH_ID <![CDATA[ >= ]]> #{bottomMonthId}
+                </if>
+
+        </where>
+        ORDER BY
+            organizeData DESC,
+            joinData DESC
+    </select>
+
 </mapper>