差值 差值 代码微调

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1490,25 +1490,21 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
         String startDate = null;
         String endDate = formDTO.getDateId();
-        String breforeStartDate = null;
         Date dateIdDate = DateUtils.parse(formDTO.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD);
         boolean isYesterday = DateUtils.getBeforeNDay(1,DateUtils.DATE_PATTERN_YYYYMMDD).equals(formDTO.getDateId());
         switch (formDTO.getType()){
             case "yesterday":
                 startDate = formDTO.getDateId();
-                breforeStartDate = startDate = DateUtils.getBeforeNDay(startDate,1);
                 endDate = formDTO.getDateId();
                 break;
             case "thisWeek":
                 startDate = DateUtils.getWeekStart(formDTO.getDateId());
-                breforeStartDate = startDate = DateUtils.getBeforeNDay(startDate,1);
                 if (!isYesterday){
                     endDate = DateUtils.getWeekEnd(formDTO.getDateId());
                 }
                 break;
             case "thisMonth":
                 startDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD);
-                breforeStartDate = startDate = DateUtils.getBeforeNDay(startDate,1);
                 if (!isYesterday) {
                     endDate = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD);
                 }
@@ -1517,6 +1513,7 @@ public class DataStatsServiceImpl implements DataStatsService {
                 log.warn("===========");
         }
         formDTO.setStartDateId(startDate);
+        String breforeStartDate = DateUtils.getBeforeNDay(formDTO.getStartDateId(),1);
         formDTO.setEndDateId(endDate);
         log.info("getSubWorkFact do select param:{}", JSON.toJSONString(formDTO));
         List<WorkFactResultDTO> result = new ArrayList<>();