kaiyu
2021-09-30 eba6f1988c6a7e37e619a27e493b17c244979070
screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java
@@ -51,7 +51,6 @@
        if (reportType == null) {
            if (startTime == null || endTime == null)
                return false;
            reportType = Constants.DAILYREPORT;
            //结束时间获取当天最后一个小时
            String endTimeStr = DateUtils.dateToDateString(endTime,"yyyy-MM-dd");
            endTimeStr+=" 23:59:59";
@@ -71,10 +70,12 @@
                //周报选项默认为上周的数据
                Date previous = DateUtils.getDateOfDay(new Date(),-7);
                startTime = DateUtils.getWeeklyStartTime(previous);
                endTime = DateUtils.getWeeklyEndTime(previous);
            } else if (reportType.equals(Constants.MONTHLYREPORT)) {
                //月报选项默认为上月的数据
                Date lastMonthFirstDay = DateUtils.getFirstDayOfLastMonth();
                startTime = DateUtils.getMonthlyStartTime(lastMonthFirstDay);
                endTime = DateUtils.getMonthlyEndTime(lastMonthFirstDay);
            } else
                return false;
        }