From 2994e3c05fb9b7fb49f9e21d6388813fca096592 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 15 Oct 2020 10:38:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E7=BA=A7=E5=AF=B9=E6=AF=94=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=95=B0=E6=8D=AE=E6=8C=89=E6=9C=88=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/form/PeerComparisonFormDTO.java      |  5 +++++
 .../service/fact/impl/FactIndexServiceImpl.java     |  2 +-
 .../mapper/screen/ScreenIndexDataMonthlyDao.xml     | 13 +------------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PeerComparisonFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PeerComparisonFormDTO.java
index aff83eca85..400e4415c0 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PeerComparisonFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PeerComparisonFormDTO.java
@@ -19,6 +19,11 @@ public class PeerComparisonFormDTO implements Serializable {
      */
     @NotBlank(message = "客户ID不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
     private String customerId;
+    /**
+     * 月份Id（格式：202009）
+     */
+    @NotBlank(message = "月份ID不能为空",groups = {MonthAblityListFormDTO.AddUserInternalGroup.class})
+    private String monthId;
     /**
      * 组织或网格Id
      */
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
index d4543b4aa7..678890b7da 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
@@ -456,7 +456,7 @@ public class FactIndexServiceImpl implements FactIndexService {
     @Override
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     public List<PeerComparisonResultDTO> peerComparison(PeerComparisonFormDTO formDTO) {
-        //1.根据组织或网格Id的上级组织Id查询同级组织或网格对应类型的得分排名（查询最近一个月数据）
+        //1.根据组织或网格Id的上级组织Id查询同级组织或网格对应类型的得分排名（按月查询）
         List<PeerComparisonResultDTO> resultList = screenIndexDataMonthlyDao.selectScoreList(formDTO);
         return resultList;
     }
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 3b655a6481..401d3d1a68 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
@@ -148,18 +148,7 @@
                 created_time desc
             limit 1
         )
-        AND MONTH_ID = (
-            select
-                month_id
-            from
-                screen_index_data_monthly
-            where
-                del_flag = '0'
-            and customer_id = #{customerId}
-            order by
-                month_id desc
-            limit 1
-        )
+        AND month_id = #{monthId}
         ORDER BY
         <if test="indexCode != null and indexCode != '' and indexCode == 'dangjiannengli'">
             (party_dev_ablity * party_dev_weight) DESC