同级对比接口数据按月查询

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
      */

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;
     }

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 = (
+        AND month_id = #{monthId}
-            select
-                month_id
-            from
-                screen_index_data_monthly
-            where
-                del_flag = '0'
-            and customer_id = #{customerId}
-            order by
-                month_id desc
-            limit 1
-        )
         ORDER BY
         <if test="indexCode != null and indexCode != '' and indexCode == 'dangjiannengli'">
             (party_dev_ablity * party_dev_weight) DESC