From 01603bb5ed2c62cc81c69ee75833a98d12fcc498 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 21 Aug 2020 14:01:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E9=83=A8=E9=97=A8=E6=8C=87?= =?UTF-8?q?=E6=95=B0=E6=8E=92=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/screen/dto/form/SubAgencyIndexRankFormDTO.java | 2 +- .../datareport/service/screen/impl/IndexServiceImpl.java | 4 ++-- .../resources/mapper/screen/ScreenIndexDataMonthlyDao.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/SubAgencyIndexRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/SubAgencyIndexRankFormDTO.java index 0ff2012301..3410d0638f 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/SubAgencyIndexRankFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/SubAgencyIndexRankFormDTO.java @@ -29,5 +29,5 @@ public class SubAgencyIndexRankFormDTO implements Serializable { @NotNull(message = "默认查询名次不能为空",groups = {SubAgencyIndexRank.class}) private Integer topNum; - private String monthId; + private String yearId; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java index 50fa7cf4be..4b3bb3b350 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java @@ -120,8 +120,8 @@ public class IndexServiceImpl implements IndexService { @Override public List subAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO) { LocalDate now = LocalDate.now().minusMonths(NumConstant.ONE); - String monthId = now.toString().substring(NumConstant.ZERO,NumConstant.FOUR).concat(now.toString().substring(NumConstant.FIVE,NumConstant.SEVEN)); - subAgencyIndexRankFormDTO.setMonthId(monthId); + int yearId = now.getYear(); + subAgencyIndexRankFormDTO.setYearId(String.valueOf(yearId)); List subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyIndexRank(subAgencyIndexRankFormDTO); if (subAgencyIndexRankResultDTOS.size() == NumConstant.ZERO){ return new ArrayList<>(); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index 78d6ced4c1..21293ad4c6 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -45,11 +45,11 @@ party_dev_ablity AS partyDevAbility, service_ablity AS serviceAbility FROM - screen_index_data_monthly + screen_index_data_yearly WHERE del_flag = '0' AND parent_id = #{agencyId} - AND month_id = #{monthId} + AND year_id = #{yearId} ORDER BY index_total DESC LIMIT #{topNum}