From 06753532a09837c4c7c80d3d249c3748d62c966d Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 8 Sep 2020 11:52:45 +0800 Subject: [PATCH] =?UTF-8?q?5=E3=80=81=E4=B8=8B=E7=BA=A7=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=8C=87=E6=95=B0=E6=8E=92=E8=A1=8C=EF=BC=88=E5=AE=89=E5=AE=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=AE=B5=E7=94=A8=EF=BC=89,=20=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=98=AF=E6=9C=88=E4=BB=BD=EF=BC=8C=E5=8F=96=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=9C=88=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java | 2 +- .../service/evaluationindex/screen/impl/IndexServiceImpl.java | 2 +- .../main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java index 0dc845d3d8..8f1e472b18 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java @@ -61,7 +61,7 @@ public interface ScreenIndexDataMonthlyDao{ List selectSubAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO); /** - * 5、下级部门指数排行（安宁数据段用） - 月 + * 5、下级部门指数排行（安宁数据段用） - 月(上一个月) * * @param formDTO * @return com.epmet.commons.tools.utils.Result> 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 89281ee674..4d23ca4bca 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 @@ -188,7 +188,7 @@ public class IndexServiceImpl implements IndexService { // 年 指数排行 subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO); } else if (ScreenConstant.MONTH_ID.equals(formDTO.getType())){ - // 月 指数排行 + // 月(上一个月) 指数排行 subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectAnNingSubAgencyIndexMonthlyRank(formDTO); } return subAgencyIndexRankResultDTOS; 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 37a8e0c33e..9a095e82d7 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 @@ -74,7 +74,7 @@ WHERE del_flag = '0' AND parent_id = #{agencyId} - AND month_id = date_format(CURDATE(), '%Y%m') + AND month_id = date_format(CURDATE(), '%Y%m') - 1 ORDER BY index_total ASC