From 43d61dde0db6337a172d102952919b78f42168dd Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 14 Jan 2022 17:45:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8A=A8=E5=8A=9B=E7=BD=91=E6=A0=BC=20?= =?UTF-8?q?=E5=B8=82=E5=8C=97=E4=B8=93=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/OrgRankDataShibeiResultDTO.java | 34 +++++++++++++++ .../controller/screen/IndexController.java | 13 ++++++ .../screen/ScreenOrgRankDataShibeiDao.java | 42 +++++++++++++++++++ .../evaluationindex/screen/IndexService.java | 10 +++++ .../screen/impl/IndexServiceImpl.java | 20 +++++++++ .../screen/ScreenOrgRankDataShibeiDao.xml | 28 +++++++++++++ 6 files changed, 147 insertions(+) create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataShibeiResultDTO.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenOrgRankDataShibeiDao.java create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataShibeiDao.xml diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataShibeiResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataShibeiResultDTO.java new file mode 100644 index 0000000000..c443f78fc5 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataShibeiResultDTO.java @@ -0,0 +1,34 @@ +package com.epmet.evaluationindex.screen.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description 市北数字社区-组织先进排行榜 查询结果dto + * @ClassName OrgRankDataResultDTO + * @Auth wangc + * @Date 2020-08-21 11:16 + */ +@Data +public class OrgRankDataShibeiResultDTO implements Serializable { + + private static final long serialVersionUID = -7874641768141936572L; + + private String orgId; + /** + * 名称 XXXX社区党委 + * */ + private String name; + + /** + * 党员数 + * */ + private BigDecimal score; + + /** + * 数据所属月份 + */ + private String monthId; +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java index dcf083d507..9a024bf0f7 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java @@ -154,6 +154,19 @@ public class IndexController { return new Result>().ok(indexService.advancedBranchRank(formDTO)); } + /** + * @param formDTO + * @Description 数字社区：数据分析-动力网格 + * @author sun + */ + @PostMapping("advancedbranchrank-shibei") + Result> advancedBranchRankShibei(@RequestBody AdvancedBranchRankFormDTO formDTO, /*@LoginUser*/ TokenDto loginUser){ + ValidatorUtils.validateEntity(formDTO, AdvancedBranchRankFormDTO.AddUserInternalGroup.class); + formDTO.setCustomerId(loginUser.getCustomerId()); + formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); + return new Result>().ok(indexService.advancedBranchRankShibei(formDTO)); + } + /** * @param formDTO * @author yinzuomei diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenOrgRankDataShibeiDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenOrgRankDataShibeiDao.java new file mode 100644 index 0000000000..b6df3da088 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenOrgRankDataShibeiDao.java @@ -0,0 +1,42 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.datareport.dao.evaluationindex.screen; + +import com.epmet.evaluationindex.screen.dto.form.AdvancedBranchRankFormDTO; +import com.epmet.evaluationindex.screen.dto.result.OrgRankDataShibeiResultDTO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 党建引领-组织排行榜 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-08-18 + */ +@Mapper +public interface ScreenOrgRankDataShibeiDao { + + /** + * @return + * @Description 查询指定机关的所有直属网格月度数据 + * @author wangc + * @date 2020.08.21 13:58 + **/ + List selectGridRankList(AdvancedBranchRankFormDTO formDTO); +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java index 97ad39b278..f8adab8479 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java @@ -94,4 +94,14 @@ public interface IndexService { * @Date 2021/2/28 14:33 **/ List subAgencyIndexRankPy(SubAgencyIndexRankPyFormDTO formDTO); + + /** + * desc: 市北数字社区特供接口 网格排行 + * + * @param formDTO + * @return java.util.List + * @author LiuJanJun + * @date 2022/1/14 4:57 下午 + */ + List advancedBranchRankShibei(AdvancedBranchRankFormDTO formDTO); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index b69407cc04..d362f50ef4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.DataSourceConstant; import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataMonthlyDao; import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataYearlyDao; +import com.epmet.datareport.dao.evaluationindex.screen.ScreenOrgRankDataShibeiDao; import com.epmet.datareport.service.evaluationindex.screen.IndexService; import com.epmet.evaluationindex.screen.constant.ScreenConstant; import com.epmet.evaluationindex.screen.dto.form.*; @@ -43,6 +44,8 @@ public class IndexServiceImpl implements IndexService { @Autowired private ScreenIndexDataMonthlyDao screenIndexDataMonthlyDao; @Autowired + private ScreenOrgRankDataShibeiDao screenOrgRankDataShibeiDao; + @Autowired private PartyMemberLeadServiceImpl partyMemberLeadServiceImpl; @Autowired private com.epmet.datareport.utils.DateUtils dateUtils; @@ -412,6 +415,23 @@ public class IndexServiceImpl implements IndexService { return list; } + /** + * @param formDTO + * @Description 先进排行-先进支部排行 + * @author sun + * @return + */ + @Override + @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true) + public List advancedBranchRankShibei(AdvancedBranchRankFormDTO formDTO) { + //根据当前所选组织，查询screen_index_data_monthly中类型为网格的按照总指数倒序，关联screen_org_rank_data表取其他数据 + //1.级联查询组织下所有网格的先进支部排行数据，按总指数降序 + if (StringUtils.isBlank(formDTO.getMonthId())) { + formDTO.setMonthId(DateUtils.getBeforeNMonth(1)); + } + return screenOrgRankDataShibeiDao.selectGridRankList(formDTO); + } + @Override @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true) public List getSubSingleIndexRank(SubSingleIndexRankFormDTO formDTO) { diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataShibeiDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataShibeiDao.xml new file mode 100644 index 0000000000..391c56eec6 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataShibeiDao.xml @@ -0,0 +1,28 @@ + + + + + + + + + + From c191724ce8119bda2814326e69beb6d36e4fd968 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 14 Jan 2022 18:01:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/govproject/ProjectDao.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index c8682a66dc..750610296a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -29,7 +29,6 @@ WHERE p.DEL_FLAG = '0' AND p.CUSTOMER_ID = #{customerId} - AND p.ORG_ID_PATH LIKE concat('%', #{agencyId}, '%') AND p.`STATUS` = #{projectStatus} From 46fbe3b38fbbddc324a168b2ad7261be3520ff71 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 14 Jan 2022 18:11:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8A=A8=E5=8A=9B=E7=BD=91=E6=A0=BC=20?= =?UTF-8?q?=E5=B8=82=E5=8C=97=E4=B8=93=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/datareport/controller/screen/IndexController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java index 9a024bf0f7..1e4a67a0b9 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java @@ -160,10 +160,10 @@ public class IndexController { * @author sun */ @PostMapping("advancedbranchrank-shibei") - Result> advancedBranchRankShibei(@RequestBody AdvancedBranchRankFormDTO formDTO, /*@LoginUser*/ TokenDto loginUser){ + Result> advancedBranchRankShibei(@RequestBody AdvancedBranchRankFormDTO formDTO, @LoginUser TokenDto loginUser){ ValidatorUtils.validateEntity(formDTO, AdvancedBranchRankFormDTO.AddUserInternalGroup.class); formDTO.setCustomerId(loginUser.getCustomerId()); - formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); + //formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); return new Result>().ok(indexService.advancedBranchRankShibei(formDTO)); } From a48f50b6b784f15718acab30112e802ac669f095 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 14 Jan 2022 18:11:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8A=A8=E5=8A=9B=E7=BD=91=E6=A0=BC=20?= =?UTF-8?q?=E5=B8=82=E5=8C=97=E4=B8=93=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenOrgRankDataShibeiDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataShibeiDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataShibeiDao.xml index 391c56eec6..762d9c5eb9 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataShibeiDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataShibeiDao.xml @@ -19,6 +19,7 @@ AND rankData.ORG_TYPE = 'grid' AND rankData.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%') AND rankData.MONTH_ID = #{monthId} + AND rankData.CUSTOMER_ID = #{customerId} ORDER BY rankData.SCORE DESC LIMIT #{topNum}