Merge remote-tracking branch 'origin/feature/phaseOne' into feature/phaseOne

# Conflicts:
#	epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java
#	epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java
#	epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java
#	epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java
#	epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java

@@ -92,6 +92,85 @@ public class EpdcScreenController {
         return epdcScreenService.governanceRanking(formDto);
     }
 
+    /**
+     * 党建引领-内容列表接口
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingNoticeListResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:31
+     */
+    @GetMapping("partyBuilding/noticeList")
+    public Result<List<EpdcScreenPartyBuildingNoticeListResultDTO>> noticeList(@RequestBody EpdcScreenPartyBuildingNoticeListFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.noticeList(formDto);
+    }
+
+    /**
+     * 党建引领-党组织活动排名接口
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgActResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 16:52
+     */
+    @GetMapping("partyBuilding/partyOrgActList")
+    public Result<List<EpdcScreenPartyBuildingPartyOrgActResultDTO>> partyOrgActList(@RequestBody EpdcScreenPartyBuildingPartyOrgActFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.partyOrgActList(formDto);
+    }
+
+    /**
+     * 党建引领-党组织类型列表接口
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgTypeResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:34
+     */
+    @GetMapping("partyBuilding/partyOrgTypeList")
+    public Result<List<EpdcScreenPartyBuildingPartyOrgTypeResultDTO>> partyOrgTypeList() {
+        return epdcScreenService.partyOrgTypeList();
+    }
+
+    /**
+     * 党建引领-党组织列表接口
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:34
+     */
+    @GetMapping("partyBuilding/partyOrgList")
+    public Result<List<EpdcScreenPartyBuildingPartyOrgResultDTO>> partyOrgList() {
+        return epdcScreenService.partyOrgList();
+    }
+
+    /**
+     * 党建引领-党员亮身份列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingBrightIdentityResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:37
+     */
+    @GetMapping("partyBuilding/brightIdentity")
+    public Result<List<EpdcScreenPartyBuildingBrightIdentityResultDTO>> brightIdentity(@RequestBody EpdcScreenPartyBuildingBrightIdentityFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.brightIdentity(formDto);
+    }
+
+    /**
+     * 党建引领-党员画像
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyMemberAgeResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:37
+     */
+    @GetMapping("partyBuilding/partyMemberAge")
+    public Result<List<EpdcScreenPartyBuildingPartyMemberAgeResultDTO>> partyMemberAge() {
+        return epdcScreenService.partyMemberAge();
+    }
+
+
     /**
      *首页-组织信息接口
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO>>

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java

@@ -63,6 +63,63 @@ public interface EpdcScreenDao extends BaseDao<EpdcScreenGridGovernanceItemResul
      */
     List<EpdcScreenGridGovernanceRankingResultDTO> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto);
 
+    /**
+     * 党建引领-内容列表接口
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingNoticeListResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:31
+     */
+    List<EpdcScreenPartyBuildingNoticeListResultDTO> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto);
+
+    /**
+     * 党建引领-党组织活动排名接口
+     *
+     * @param formDto
+     * @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgActResultDTO>
+     * @author Liuchuang
+     * @since 2021/8/11 16:57
+     */
+    List<EpdcScreenPartyBuildingPartyOrgActResultDTO> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto);
+
+    /**
+     * 党建引领-党组织类型列表接口
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgTypeResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:34
+     */
+    List<EpdcScreenPartyBuildingPartyOrgTypeResultDTO> partyOrgTypeList();
+
+    /**
+     * 党建引领-党组织列表接口
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:34
+     */
+    List<EpdcScreenPartyBuildingPartyOrgResultDTO> partyOrgList();
+
+    /**
+     * 党建引领-党员亮身份列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingBrightIdentityResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:37
+     */
+    List<EpdcScreenPartyBuildingBrightIdentityResultDTO> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto);
+
+    /**
+     * 党建引领-党员画像
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyMemberAgeResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:37
+     */
+    List<EpdcScreenPartyBuildingPartyMemberAgeResultDTO> partyMemberAge();
+
     /**
      * 首页-组织信息接口
      * @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO>

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java

@@ -63,6 +63,64 @@ public interface EpdcScreenService {
      */
     Result<List<EpdcScreenGridGovernanceRankingResultDTO>> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto);
 
+    /**
+     * 党建引领-内容列表接口
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingNoticeListResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:31
+     */
+    Result<List<EpdcScreenPartyBuildingNoticeListResultDTO>> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto);
+
+    /**
+     * 党建引领-党组织活动排名接口
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgActResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 16:52
+     */
+    Result<List<EpdcScreenPartyBuildingPartyOrgActResultDTO>> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto);
+
+    /**
+     * 党建引领-党组织类型列表接口
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgTypeResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:34
+     */
+    Result<List<EpdcScreenPartyBuildingPartyOrgTypeResultDTO>> partyOrgTypeList();
+
+    /**
+     * 党建引领-党组织列表接口
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:34
+     */
+    Result<List<EpdcScreenPartyBuildingPartyOrgResultDTO>> partyOrgList();
+
+    /**
+     * 党建引领-党员亮身份列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingBrightIdentityResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:37
+     */
+    Result<List<EpdcScreenPartyBuildingBrightIdentityResultDTO>> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto);
+
+    /**
+     * 党建引领-党员画像
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyMemberAgeResultDTO>>
+     * @author Liuchuang
+     * @since 2021/8/11 14:37
+     */
+    Result<List<EpdcScreenPartyBuildingPartyMemberAgeResultDTO>> partyMemberAge();
+
+
     /**
      * 首页-组织信息接口
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO>>

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java

@@ -4,6 +4,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.analysis.pc.screen.form.*;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.*;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
 import com.elink.esua.epdc.modules.screen.dao.EpdcScreenDao;
 import com.elink.esua.epdc.modules.screen.service.EpdcScreenService;
@@ -56,6 +58,48 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl<EpdcScreenDao, EpdcSc
         return new Result<List<EpdcScreenGridGovernanceRankingResultDTO>>().ok(data);
     }
 
+    @Override
+    public Result<List<EpdcScreenPartyBuildingNoticeListResultDTO>> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto) {
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
+        List<EpdcScreenPartyBuildingNoticeListResultDTO> data = baseDao.noticeList(formDto);
+        return new Result<List<EpdcScreenPartyBuildingNoticeListResultDTO>>().ok(data);
+    }
+
+    @Override
+    public Result<List<EpdcScreenPartyBuildingPartyOrgActResultDTO>> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto) {
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
+        List<EpdcScreenPartyBuildingPartyOrgActResultDTO> data = baseDao.partyOrgActList(formDto);
+        return new Result<List<EpdcScreenPartyBuildingPartyOrgActResultDTO>>().ok(data);
+    }
+
+    @Override
+    public Result<List<EpdcScreenPartyBuildingPartyOrgTypeResultDTO>> partyOrgTypeList() {
+        List<EpdcScreenPartyBuildingPartyOrgTypeResultDTO> data = baseDao.partyOrgTypeList();
+        return new Result<List<EpdcScreenPartyBuildingPartyOrgTypeResultDTO>>().ok(data);
+    }
+
+    @Override
+    public Result<List<EpdcScreenPartyBuildingPartyOrgResultDTO>> partyOrgList() {
+        List<EpdcScreenPartyBuildingPartyOrgResultDTO> data = baseDao.partyOrgList();
+        return new Result<List<EpdcScreenPartyBuildingPartyOrgResultDTO>>().ok(data);
+    }
+
+    @Override
+    public Result<List<EpdcScreenPartyBuildingBrightIdentityResultDTO>> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto) {
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
+        List<EpdcScreenPartyBuildingBrightIdentityResultDTO> data = baseDao.brightIdentity(formDto);
+        return new Result<List<EpdcScreenPartyBuildingBrightIdentityResultDTO>>().ok(data);
+    }
+
+    @Override
+    public Result<List<EpdcScreenPartyBuildingPartyMemberAgeResultDTO>> partyMemberAge() {
+        List<EpdcScreenPartyBuildingPartyMemberAgeResultDTO> data = baseDao.partyMemberAge();
+        return new Result<List<EpdcScreenPartyBuildingPartyMemberAgeResultDTO>>().ok(data);
+    }
+
     @Override
     public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList() {
         List<EpdcScreenFrontPageDeptInfoResultDTO> data = baseDao.frontPageDeptInfoList();

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

@@ -3,8 +3,7 @@
 
 <mapper namespace="com.elink.esua.epdc.modules.screen.dao.EpdcScreenDao">
 
-    <select id="gridGovernanceItemList"
+    <select id="gridGovernanceItemList" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO">
-            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO">
         SELECT
             i.ID,
             i.ITEM_CONTENT,
@@ -25,8 +24,7 @@
         LIMIT #{pageIndex}, #{pageSize}
     </select>
 
-    <select id="itemCategoryStatistics"
+    <select id="itemCategoryStatistics" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemCategoryResultDTO">
-            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemCategoryResultDTO">
         SELECT
             ec.CATEGORY_NAME,
             t.itemNum
@@ -50,8 +48,7 @@
           AND ec.CATEGORY_TYPE = '0'
     </select>
 
-    <select id="itemStatusStatistics"
+    <select id="itemStatusStatistics" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemStatusResultDTO">
-            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemStatusResultDTO">
         SELECT
             IFNULL(SUM(ITEM_STATE = 0), 0) AS processingNum,
             IFNULL(SUM(ITEM_STATE = 5 OR ITEM_STATE = 10), 0) AS completedNum
@@ -61,8 +58,7 @@
             DEL_FLAG = '0'
     </select>
 
-    <select id="difficultItemList"
+    <select id="difficultItemList" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemDifficultResultDTO">
-            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemDifficultResultDTO">
         SELECT
             di.EVENT_ID,
             di.ITEM_CONTENT,
@@ -93,8 +89,7 @@
         LIMIT #{pageIndex}, #{pageSize}
     </select>
 
-    <select id="governanceRanking"
+    <select id="governanceRanking" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceRankingResultDTO">
-            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceRankingResultDTO">
         SELECT
             DEPT_ID,
             DEPT_NAME,
@@ -128,6 +123,124 @@
         LIMIT #{pageIndex}, #{pageSize}
     </select>
 
+    <select id="noticeList" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingNoticeListResultDTO">
+        SELECT
+            n.ID,
+            n.NOTICE_TITLE,
+            n.NOTICE_CONTENT,
+            n.DEPT_NAME,
+            n.CREATED_TIME,
+            n.TOP_FLAG
+        FROM
+            yushan_esua_epdc_news.epdc_notice n
+            LEFT JOIN yushan_esua_epdc_news.epdc_module_type t ON t.id = n.TYPE_ID
+        WHERE
+            n.DEL_FLAG = '0'
+          AND n.NOTICE_RELEASE_STATE = '1'
+          AND n.NOTICE_UP_DOWN_STATE = '1'
+          AND t.TYPE_CODE = #{typeCode}
+
+        ORDER BY
+            n.TOP_FLAG DESC,
+            n.TOP_TIME DESC,
+            n.CREATED_TIME DESC
+        LIMIT #{pageIndex}, #{pageSize}
+    </select>
+
+    <select id="partyOrgActList" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgActResultDTO">
+        SELECT
+            d.id AS deptId,
+            d.`name` AS deptName,
+            IFNULL( a.ACT_ZTDR_NUM, 0 ) AS actZtdrNum,
+            IFNULL( a.ACT_SHYK_NUM, 0 ) AS actShykNum,
+            IFNULL( a.ACT_LJGJ_NUM, 0 ) AS actLjgjNum,
+            IFNULL( a.ACT_ZTDR_PERSON_NUM, 0 ) AS actZtdrPersonNum,
+            IFNULL( a.ACT_SHYK_PERSON_NUM, 0 ) AS actShykPersonNum,
+            IFNULL( a.ACT_LJGJ_PERSON_NUM, 0 ) AS actLjgjPersonNum
+        FROM
+            yushan_esua_epdc_admin.sys_dept d
+                LEFT JOIN yushan_esua_epdc_analysis.epdc_screen_community_act_statistics a ON a.DEPT_ID = d.id
+                AND a.DEL_FLAG = '0'
+        WHERE
+            d.del_flag = 0
+          AND d.type_key = 'community_party'
+        ORDER BY
+        <if test="orderType == 0">
+            actZtdrNum+actShykNum+actLjgjNum DESC,
+        </if>
+        <if test="orderType == 1">
+            actZtdrPersonNum+actShykPersonNum+actLjgjPersonNum DESC,
+        </if>
+            d.`name`
+        LIMIT #{pageIndex}, #{pageSize}
+    </select>
+
+    <select id="partyOrgTypeList" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgTypeResultDTO">
+        SELECT
+            ot.ID,
+            ot.TYPE_NAME,
+            COUNT( po.ID ) AS partyOrgNum
+        FROM
+            yushan_esua_epdc_admin.epdc_party_org_type ot
+                LEFT JOIN yushan_esua_epdc_admin.epdc_party_org po ON po.TYPE_CODE = ot.TYPE_CODE
+                AND po.DEL_FLAG = '0'
+        WHERE
+            ot.DEL_FLAG = '0'
+          AND `ENABLE` = '1'
+        ORDER BY
+            SORT
+    </select>
+
+    <select id="partyOrgList" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgResultDTO">
+        SELECT
+            ID,
+            PARTY_ORG_NAME,
+            INTRODUCTION,
+            TWO_COMMITTEES,
+            PARTY_MEMBER_NUM,
+            LONGITUDE,
+            LATITUDE
+        FROM
+            yushan_esua_epdc_admin.epdc_party_org
+        WHERE
+            DEL_FLAG = '0'
+    </select>
+
+    <select id="brightIdentity" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingBrightIdentityResultDTO">
+        SELECT
+            ui.ID,
+            u.REAL_NAME,
+            u.FACE_IMG,
+            u.MOBILE,
+            ui.MOTTO,
+            ui.PROMISE,
+            ui.SERVICE_AREA
+        FROM
+            yushan_esua_epdc_user.epdc_user_info ui
+                LEFT JOIN yushan_esua_epdc_user.epdc_user u ON u.ID = ui.USER_ID
+        WHERE
+            ui.DEL_FLAG = '0'
+          AND ui.RECOMMEND_FLAG = '1'
+        ORDER BY
+            ui.RECOMMEND_TIME DESC,
+            ui.CREATED_TIME DESC
+        LIMIT #{pageIndex}, #{pageSize}
+    </select>
+
+    <select id="partyMemberAge" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyMemberAgeResultDTO">
+        SELECT
+            IFNULL(SUM( AGE_EIGHTEEN_THIRTY ), 0) AS ageEighteenThirty,
+            IFNULL(SUM( AGE_THIRTY_ONE_FORTY ), 0) AS ageThirtyOneForty,
+            IFNULL(SUM( AGE_FORTY_ONE_FIFTY ), 0) AS ageFortyOneFifty,
+            IFNULL(SUM( AGE_FIFTY_ONE_SIXTY ), 0) AS ageFiftyOneSixty,
+            IFNULL(SUM( AGE_SIXTY_ONE_SEVENTY ), 0) AS ageSixtyOneSeventy,
+            IFNULL(SUM( AGE_OVER_SEVENTY ), 0) AS ageOverSeventy
+        FROM
+            yushan_esua_epdc_analysis.epdc_screen_party_member_age_statistics
+        WHERE
+            DEL_FLAG = '0'
+    </select>
+
     <select id="frontPageDeptInfoList"
             resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO">
       SELECT