Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java

@@ -28,6 +28,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -91,7 +93,13 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
             userSummaryInfoResultDTO=userAnalysisDao.selectRegUserSummaryInfo(myAgencyId);
         }
         if (userSummaryInfoResultDTO == null){
-            return new UserSummaryInfoResultDTO();
+            userSummaryInfoResultDTO = new UserSummaryInfoResultDTO();
+
+            LocalDate yesterday = LocalDate.now().plusDays(NumConstant.MINUS_ONE_L);
+            DateTimeFormatter format = DateTimeFormatter.ofPattern(DateUtils.DATE_PATTERN_YYYYMMDD);
+            userSummaryInfoResultDTO.setCurrentDate(DateUtils.getxAxisDatePattern(yesterday.format(format),"."));
+
+            return userSummaryInfoResultDTO;
         }
             userSummaryInfoResultDTO.setCurrentDate(DateUtils.getxAxisDatePattern(userSummaryInfoResultDTO.getCurrentDate(),"."));
             //提取出工具类