diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 1fbb2b3..9d20969 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/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> + * @author Liuchuang + * @since 2021/8/11 14:31 + */ + @GetMapping("partyBuilding/noticeList") + public Result> noticeList(@RequestBody EpdcScreenPartyBuildingNoticeListFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.noticeList(formDto); + } + + /** + * 党建引领-党组织活动排名接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 16:52 + */ + @GetMapping("partyBuilding/partyOrgActList") + public Result> partyOrgActList(@RequestBody EpdcScreenPartyBuildingPartyOrgActFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.partyOrgActList(formDto); + } + + /** + * 党建引领-党组织类型列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + @GetMapping("partyBuilding/partyOrgTypeList") + public Result> partyOrgTypeList() { + return epdcScreenService.partyOrgTypeList(); + } + + /** + * 党建引领-党组织列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + @GetMapping("partyBuilding/partyOrgList") + public Result> partyOrgList() { + return epdcScreenService.partyOrgList(); + } + + /** + * 党建引领-党员亮身份列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + @GetMapping("partyBuilding/brightIdentity") + public Result> brightIdentity(@RequestBody EpdcScreenPartyBuildingBrightIdentityFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.brightIdentity(formDto); + } + + /** + * 党建引领-党员画像 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + @GetMapping("partyBuilding/partyMemberAge") + public Result> partyMemberAge() { + return epdcScreenService.partyMemberAge(); + } + + /** *首页-组织信息接口 * @return com.elink.esua.epdc.commons.tools.utils.Result> diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 00d769f..e8f8199 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/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 governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); + /** + * 党建引领-内容列表接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:31 + */ + List noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto); + + /** + * 党建引领-党组织活动排名接口 + * + * @param formDto + * @return java.util.List + * @author Liuchuang + * @since 2021/8/11 16:57 + */ + List partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto); + + /** + * 党建引领-党组织类型列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + List partyOrgTypeList(); + + /** + * 党建引领-党组织列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + List partyOrgList(); + + /** + * 党建引领-党员亮身份列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + List brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto); + + /** + * 党建引领-党员画像 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + List partyMemberAge(); + /** * 首页-组织信息接口 * @return java.util.List diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index 32ae2bc..2ba1162 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -63,6 +63,64 @@ public interface EpdcScreenService { */ Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); + /** + * 党建引领-内容列表接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:31 + */ + Result> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto); + + /** + * 党建引领-党组织活动排名接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 16:52 + */ + Result> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto); + + /** + * 党建引领-党组织类型列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + Result> partyOrgTypeList(); + + /** + * 党建引领-党组织列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + Result> partyOrgList(); + + /** + * 党建引领-党员亮身份列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto); + + /** + * 党建引领-党员画像 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + Result> partyMemberAge(); + + /** * 首页-组织信息接口 * @return com.elink.esua.epdc.commons.tools.utils.Result> diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index c2909ae..3a1a55e 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/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>().ok(data); } + @Override + public Result> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.noticeList(formDto); + return new Result>().ok(data); + } + + @Override + public Result> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.partyOrgActList(formDto); + return new Result>().ok(data); + } + + @Override + public Result> partyOrgTypeList() { + List data = baseDao.partyOrgTypeList(); + return new Result>().ok(data); + } + + @Override + public Result> partyOrgList() { + List data = baseDao.partyOrgList(); + return new Result>().ok(data); + } + + @Override + public Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.brightIdentity(formDto); + return new Result>().ok(data); + } + + @Override + public Result> partyMemberAge() { + List data = baseDao.partyMemberAge(); + return new Result>().ok(data); + } + @Override public Result> frontPageDeptInfoList() { List data = baseDao.frontPageDeptInfoList(); diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 838a00e..7810b71 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -3,30 +3,28 @@ - SELECT - i.ID, - i.ITEM_CONTENT, - c.CATEGORY_NAME, - i.DISTRIBUTE_TIME, - IFNULL(e.APPROVE_NUM + e.OPPOSE_NUM + e.COMMENT_NUM, 0) AS attentionNum + i.ID, + i.ITEM_CONTENT, + c.CATEGORY_NAME, + i.DISTRIBUTE_TIME, + IFNULL(e.APPROVE_NUM + e.OPPOSE_NUM + e.COMMENT_NUM, 0) AS attentionNum FROM - yushan_esua_epdc_events.epdc_item i - LEFT JOIN yushan_esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE - LEFT JOIN yushan_esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID + yushan_esua_epdc_events.epdc_item i + LEFT JOIN yushan_esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE + LEFT JOIN yushan_esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID WHERE - i.DEL_FLAG = '0' + i.DEL_FLAG = '0' ORDER BY attentionNum DESC, - i.DISTRIBUTE_TIME DESC + i.DISTRIBUTE_TIME DESC LIMIT #{pageIndex}, #{pageSize} - SELECT ec.CATEGORY_NAME, t.itemNum @@ -50,8 +48,7 @@ AND ec.CATEGORY_TYPE = '0' - SELECT IFNULL(SUM(ITEM_STATE = 0), 0) AS processingNum, IFNULL(SUM(ITEM_STATE = 5 OR ITEM_STATE = 10), 0) AS completedNum @@ -61,24 +58,23 @@ DEL_FLAG = '0' - SELECT - di.EVENT_ID, - di.ITEM_CONTENT, - di.DISTRIBUTE_TIME, - di.SPEND_TIME, - di.HANDLE_TOTAL, - di.DEPT_TOTAL + di.EVENT_ID, + di.ITEM_CONTENT, + di.DISTRIBUTE_TIME, + di.SPEND_TIME, + di.HANDLE_TOTAL, + di.DEPT_TOTAL FROM - yushan_esua_epdc_analysis.epdc_difficult_item di, - yushan_esua_epdc_analysis.epdc_item_difficult_config dc + yushan_esua_epdc_analysis.epdc_difficult_item di, + yushan_esua_epdc_analysis.epdc_item_difficult_config dc WHERE - di.DEL_FLAG = '0' - AND ( - di.SPEND_TIME >= dc.MIN_SPEND_TIME - OR di.HANDLE_TOTAL >= dc.MIN_HANDLE_TOTAL - OR di.DEPT_TOTAL >= dc.MIN_DEPT_TOTAL) + di.DEL_FLAG = '0' + AND ( + di.SPEND_TIME >= dc.MIN_SPEND_TIME + OR di.HANDLE_TOTAL >= dc.MIN_HANDLE_TOTAL + OR di.DEPT_TOTAL >= dc.MIN_DEPT_TOTAL) ORDER BY di.SPEND_TIME DESC, @@ -89,25 +85,24 @@ di.HANDLE_TOTAL DESC, - di.DISTRIBUTE_TIME DESC + di.DISTRIBUTE_TIME DESC LIMIT #{pageIndex}, #{pageSize} - SELECT - DEPT_ID, - DEPT_NAME, - REGISTRATION_RATE, - RESPONSE_RATE, - RESOLUTION_RATE, - SATISFACTION_RATE, - AUTONOMY_RATE + DEPT_ID, + DEPT_NAME, + REGISTRATION_RATE, + RESPONSE_RATE, + RESOLUTION_RATE, + SATISFACTION_RATE, + AUTONOMY_RATE FROM - yushan_esua_epdc_analysis.epdc_screen_governance_ranking + yushan_esua_epdc_analysis.epdc_screen_governance_ranking WHERE - DEL_FLAG = '0' - AND STATISTIC_TYPE = #{statisticType} + DEL_FLAG = '0' + AND STATISTIC_TYPE = #{statisticType} ORDER BY REGISTRATION_RATE DESC, @@ -128,6 +123,124 @@ LIMIT #{pageIndex}, #{pageSize} + + + + + + + + + + + +