酷乐秀优化

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/HomeServiceImpl.java

@@ -398,22 +398,16 @@ public class HomeServiceImpl implements HomeService {
         String groupBy;
         List<String> dateList;
         Date startDate = DateUtil.strToDate(summarySearch.getStartTime(), DateUtil.DEFAULT_PATTERN);
-        if(StringUtils.equals(summarySearch.getStartTime(),summarySearch.getEndTime())){
-            groupBy = "%Y-%m-%d %H";
-            //获取当天的小时段
-            dateList = DateUtil.getHourList(startDate);
+        Date endDate = DateUtil.strToDate(summarySearch.getEndTime(), DateUtil.DEFAULT_PATTERN);
+        if(DateUtil.daysBetween(startDate,endDate) <= 31){
+            groupBy = "%Y-%m-%d";
+            dateList = DateUtil.getDayList(startDate,endDate);
+        }else if(DateUtil.monthsBetween(startDate,endDate) <= 12){
+            groupBy = "%Y-%m";
+            dateList = DateUtil.getMonthList(startDate,endDate);
         }else {
-            Date endDate = DateUtil.strToDate(summarySearch.getEndTime(), DateUtil.DEFAULT_PATTERN);
-            if(DateUtil.daysBetween(startDate,endDate) <= 31){
-                groupBy = "%Y-%m-%d";
-                dateList = DateUtil.getDayList(startDate,endDate);
-            }else if(DateUtil.monthsBetween(startDate,endDate) <= 12){
-                groupBy = "%Y-%m";
-                dateList = DateUtil.getMonthList(startDate,endDate);
-            }else {
-                groupBy = "%Y";
-                dateList = DateUtil.getYearList(startDate,endDate);
-            }
+            groupBy = "%Y";
+            dateList = DateUtil.getYearList(startDate,endDate);
         }
         //获取老师关联的学员
         List<Long> studentIds = teacherService.getDao().getStudentIds(summarySearch.getTeacherId(), summarySearch.getSubjectId(), summarySearch.getStartTime(), summarySearch.getEndTime());