Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java

@@ -16,4 +16,7 @@ public interface ScreenConstant {
 
     String COMMA = ",";
 
+    String MONTH_ID = "month";
+
+    String YEAR_ID = "year";
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -7,6 +7,7 @@ import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataMonthlyDao
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataYearlyDao;
 import com.epmet.datareport.service.evaluationindex.screen.IndexService;
 import com.epmet.datareport.utils.DateUtils;
+import com.epmet.evaluationindex.screen.constant.ScreenConstant;
 import com.epmet.evaluationindex.screen.dto.form.*;
 import com.epmet.evaluationindex.screen.dto.result.*;
 import org.apache.commons.lang3.StringUtils;
@@ -183,10 +184,10 @@ public class IndexServiceImpl implements IndexService {
     @Override
     public List<SubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO) {
         List<SubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();
-        if ("year".equals(formDTO.getType())){
+        if (ScreenConstant.YEAR_ID.equals(formDTO.getType())){
             // 年 指数排行
             subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO);
-        } else if ("month".equals(formDTO.getType())){
+        } else if (ScreenConstant.MONTH_ID.equals(formDTO.getType())){
             // 月 指数排行
             subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectAnNingSubAgencyIndexMonthlyRank(formDTO);
         }