From 24cc26deed6f76a263bb859795513bd940214cf1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 4 Nov 2020 10:21:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=89=E5=AE=81=2003=E3=80=81=E5=9F=BA?= =?UTF-8?q?=E5=B1=82=E5=85=9A=E5=91=98-=E5=85=9A=E5=91=98=E6=8E=92?= =?UTF-8?q?=E8=A1=8C=E6=A6=9C=E5=8D=95=20=E9=87=87=E9=9B=86=E5=92=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E6=9C=88=E4=BB=BDId=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/dto/form/AnScreenRankFormDTO.java | 4 ++++ .../screen/dto/result/PmRankResultDTO.java | 4 ++++ .../screenan/ScreenAnGrassRootsPmRankDao.java | 3 ++- .../screen/impl/AnScreenServiceImpl.java | 17 ++++++++++++++++- .../screenan/ScreenAnGrassRootsPmRankDao.xml | 7 +++++-- .../form/AnGrassRootsPmRankFormDTO.java | 5 +++++ .../controller/AnScreenCollController.java | 4 +++- .../screen/ScreenAnGrassRootsPmRankDao.java | 13 +++++++------ .../screen/ScreenAnGrassRootsPmRankEntity.java | 8 +++++--- .../screen/impl/AnScreenCollServiceImpl.java | 4 ++-- .../screen/ScreenAnGrassRootsPmRankDao.xml | 3 +++ 11 files changed, 56 insertions(+), 16 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AnScreenRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AnScreenRankFormDTO.java index 2b787582dd..f7afcbe24f 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AnScreenRankFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AnScreenRankFormDTO.java @@ -25,4 +25,8 @@ public class AnScreenRankFormDTO implements Serializable { private String agencyId; @NotNull(message = "top值不能为空", groups = AnScreenRankFormDTO.AnScreenRankGroup.class) private Integer topNum; + /** + * 月份ID，默认上一个月 + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmRankResultDTO.java index c813fdf694..7a2717a86b 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmRankResultDTO.java @@ -47,4 +47,8 @@ public class PmRankResultDTO implements Serializable { * 议题数 */ private Integer issueTotal; + /** + * 月份Id + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenan/ScreenAnGrassRootsPmRankDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenan/ScreenAnGrassRootsPmRankDao.java index 141853010d..821ccb6c1f 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenan/ScreenAnGrassRootsPmRankDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenan/ScreenAnGrassRootsPmRankDao.java @@ -35,11 +35,12 @@ public interface ScreenAnGrassRootsPmRankDao { * 基层党员-党员排行榜单 * * @param agencyId + * @param monthId * @param topNum * @return java.util.List * @author zhaoqifeng * @date 2020/10/9 15:43 */ - List selectPmRank(@Param("agencyId") String agencyId, @Param("topNum") Integer topNum); + List selectPmRank(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("topNum") Integer topNum); } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java index 0d8a064bcb..158ca87d8e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.evaluationindex.screen.dto.form.AnScreenFormDTO; import com.epmet.evaluationindex.screen.dto.form.AnScreenRankFormDTO; import com.epmet.evaluationindex.screen.dto.form.AnScreenTrendFormDTO; import com.epmet.evaluationindex.screen.dto.result.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,6 +48,7 @@ public class AnScreenServiceImpl implements AnScreenService { * @date 2020/10/9 13:55 */ @Override + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) public PmTotalResultDTO pmTotal(AnScreenFormDTO formDTO) { return screenAnGrassRootsPmTotalMonthlyDao.selectPmTotal(formDTO.getAgencyId(), formDTO.getMonthId()); } @@ -60,6 +62,7 @@ public class AnScreenServiceImpl implements AnScreenService { * @date 2020/10/9 13:57 */ @Override + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) public PmTotalTrendResultDTO pmTotalTrend(AnScreenTrendFormDTO formDTO) { PmTotalTrendResultDTO resultDTO = new PmTotalTrendResultDTO(); String yearId = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY); @@ -86,8 +89,13 @@ public class AnScreenServiceImpl implements AnScreenService { * @date 2020/10/9 13:59 */ @Override + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) public List pmRank(AnScreenRankFormDTO formDTO) { - return screenAnGrassRootsPmRankDao.selectPmRank(formDTO.getAgencyId(), formDTO.getTopNum()); + String monthId = formDTO.getMonthId(); + if (StringUtils.isBlank(monthId)){ + monthId = DateUtils.getBeforeNMonth(1); + } + return screenAnGrassRootsPmRankDao.selectPmRank(formDTO.getAgencyId(), monthId,formDTO.getTopNum()); } /** @@ -99,6 +107,7 @@ public class AnScreenServiceImpl implements AnScreenService { * @date 2020/10/9 14:01 */ @Override + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) public GrassRootsOrgResultDTO grassRootsOrg(AnScreenFormDTO formDTO) { return screenAnGrassRootsOrgMonthlyDao.selectGrassRootsOrg(formDTO.getAgencyId(), formDTO.getMonthId()); } @@ -112,6 +121,7 @@ public class AnScreenServiceImpl implements AnScreenService { * @date 2020/10/9 14:03 */ @Override + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) public GrassRootsOrgTrendResultDTO grassRootsOrgTrend(AnScreenTrendFormDTO formDTO) { GrassRootsOrgTrendResultDTO resultDTO = new GrassRootsOrgTrendResultDTO(); String yearId = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY); @@ -136,6 +146,7 @@ public class AnScreenServiceImpl implements AnScreenService { * @date 2020/10/9 14:06 */ @Override + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) public List grassRootsOrgRank(AnScreenFormDTO formDTO) { return screenAnGrassRootsOrgMonthlyDao.selectGrassRootsOrgRank(formDTO.getAgencyId(), formDTO.getMonthId()); } @@ -149,6 +160,7 @@ public class AnScreenServiceImpl implements AnScreenService { * @date 2020/10/9 14:10 */ @Override + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) public GrassRootsGovernResultDTO grassRootsGovern(AnScreenFormDTO formDTO) { return screenAnGrassRootsGovernMonthlyDao.selectGrassRootsGovern(formDTO.getAgencyId(), formDTO.getMonthId()); } @@ -162,6 +174,7 @@ public class AnScreenServiceImpl implements AnScreenService { * @date 2020/10/9 14:11 */ @Override + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) public GrassRootsGovernTrendResultDTO grassRootsGovernTrend(AnScreenTrendFormDTO formDTO) { GrassRootsGovernTrendResultDTO resultDTO = new GrassRootsGovernTrendResultDTO(); String yearId = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY); @@ -190,6 +203,7 @@ public class AnScreenServiceImpl implements AnScreenService { * @date 2020/10/9 14:13 */ @Override + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) public List grassRootsGovernRank(AnScreenFormDTO formDTO) { return screenAnGrassRootsGovernMonthlyDao.selectGrassRootsGovernRank(formDTO.getAgencyId(), formDTO.getMonthId()); } @@ -203,6 +217,7 @@ public class AnScreenServiceImpl implements AnScreenService { * @date 2020/10/9 14:16 */ @Override + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) public List projectProfile(String customerId) { return screenAnCommunityProjectProfileDao.selectProjectProfile(customerId); } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmRankDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmRankDao.xml index dc13015231..feb6f4d1b4 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmRankDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmRankDao.xml @@ -4,16 +4,19 @@