kaiyu
2021-10-09 2dee01ae6f13a72b1d2ba9ca3d1ffbea72ab513b
screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java
@@ -58,20 +58,20 @@
        } else {
            if(startTime!=null&&endTime!=null)
                return false;
            if (reportType.equals(Constants.HOURYLYREPORT)) {
            if (reportType.equals(Constants.HOURLY_REPORT)) {
                //时报选项默认为上个小时的数据
                Date previousHour = DateUtils.getDateOfMin(new Date(), -60);
                startTime = DateUtils.getHourlyStartTime(previousHour);
            } else if (reportType.equals(Constants.DAILYREPORT)) {
            } else if (reportType.equals(Constants.DAILY_REPORT)) {
                //日报选项默认为昨天的数据
                Date yesterday = DateUtils.getDateOfDay(new Date(),-1);
                startTime = DateUtils.getDailyStartTime(yesterday);
            } else if (reportType.equals(Constants.WEEKLYREPORT)) {
            } else if (reportType.equals(Constants.WEEKLY_REPORT)) {
                //周报选项默认为上周的数据
                Date previous = DateUtils.getDateOfDay(new Date(),-7);
                startTime = DateUtils.getWeeklyStartTime(previous);
                endTime = DateUtils.getWeeklyEndTime(previous);
            } else if (reportType.equals(Constants.MONTHLYREPORT)) {
            } else if (reportType.equals(Constants.MONTHLY_REPORT)) {
                //月报选项默认为上月的数据
                Date lastMonthFirstDay = DateUtils.getFirstDayOfLastMonth();
                startTime = DateUtils.getMonthlyStartTime(lastMonthFirstDay);