Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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

@@ -118,7 +118,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         if (!CollectionUtils.isEmpty(customerIds)) {
             customerIds.forEach(customerId -> {
                 if (StringUtils.isNotBlank(formDTO.getStartMonth()) && StringUtils.isNotBlank(formDTO.getEndMonth())) {
-                    List<String> daysBetween = DateUtils.getMonthBetween(formDTO.getStartDate(), formDTO.getEndDate());
+                    List<String> daysBetween = DateUtils.getMonthBetween(formDTO.getStartMonth(), formDTO.getEndMonth());
                     daysBetween.forEach(monthId -> {
                         extractMonthly(customerId, monthId);
                     });

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java

@@ -86,7 +86,7 @@ public class ScreenUserJoinServiceImpl extends BaseServiceImpl<ScreenUserJoinDao
                     if (list.get(i).getOrgId().equals(lastMonthJoinList.get(j).getOrgId())) {
                         ScreenUserJoinEntity entity = ConvertUtils.sourceToTarget(list.get(i), ScreenUserJoinEntity.class);
                         ScreenUserJoinEntity lastJoinEntity = null;
-                        if (i > lastMonthJoinList.size()){
+                        if (i >= lastMonthJoinList.size()){
                             lastJoinEntity = new ScreenUserJoinEntity();
                             lastJoinEntity.setJoinTotal(NumConstant.ZERO);
                             lastJoinEntity.setAvgIssue(NumConstant.ZERO_DECIMAL);