按月抽取 月份参数错误

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -96,7 +96,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                 } else if (StringUtils.isNotBlank(formDTO.getMonthId())) {
                     extractMonthly(customerId, formDTO.getMonthId());
                 } else {
-                    String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", "");
+                    String dateId = LocalDate.now().minusMonths(NumConstant.ONE).toString().replace("-", "");
                     extractMonthly(customerId, dateId);
                 }
             });

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -641,11 +641,15 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         List<ScreenCustomerAgencyEntity> parentAgencyList = screenCustomerAgencyDao.selectListAgencyInfo(customerId);
         int j = 0;
         for(Map.Entry<String,List<AgencyScoreDTO>> agencyScore : collect.entrySet()){
+            if (NumConstant.ZERO_STR.equals(agencyScore.getKey())) {
+                log.warn("insertIndexDataMonthlyByAgencyScore agencyyId is 0");
+                continue;
+            }
             IndexDataMonthlyFormDTO monthlyFormDTO = new IndexDataMonthlyFormDTO();
             // 给4个指数 赋默认值
             monthlyFormDTO = this.setIndexDefaultValueFor(monthlyFormDTO);
-            for ( int i = 0; i < agencyScore.getValue().size(); i++){
+            for (int i = 0; i < agencyScore.getValue().size(); i++) {
-                if (NumConstant.ONE_STR.equals(agencyScore.getValue().get(i).getIsTotal())){
+                if (NumConstant.ONE_STR.equals(agencyScore.getValue().get(i).getIsTotal())) {
                     // 是总分   总指数 = IS_TOTAL = 1
                     monthlyFormDTO.setIndexTotal(agencyScore.getValue().get(i).getScore());
                 } else {