Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

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

@@ -108,8 +108,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                 } else if (StringUtils.isNotBlank(formDTO.getMonthId())) {
                     extractMonthly(customerId, formDTO.getMonthId());
                 } else {
-                    String dateId = LocalDate.now().minusMonths(NumConstant.ONE).toString().replace("-", "");
+                    String monthId = LocalDate.now().minusMonths(NumConstant.ONE).toString().replace("-", "").substring(NumConstant.ZERO,NumConstant.SIX);
-                    extractMonthly(customerId, dateId);
+                    extractMonthly(customerId, monthId);
                 }
             });
         }