diff --git a/src/main/java/com/nis/web/service/restful/TrafficReportService.java b/src/main/java/com/nis/web/service/restful/TrafficReportService.java index 76b6cfb..12c9b1c 100644 --- a/src/main/java/com/nis/web/service/restful/TrafficReportService.java +++ b/src/main/java/com/nis/web/service/restful/TrafficReportService.java @@ -25,7 +25,9 @@ import com.nis.util.DateUtils; import com.nis.util.StringUtils; import com.nis.web.dao.TrafficReportDao; import com.nis.web.service.BaseLogService; +import com.zdjizhi.utils.DateUtil; import com.zdjizhi.utils.StringUtil; +import com.zdjizhi.utils.TimeConstants; @Service public class TrafficReportService extends BaseLogService { @@ -89,6 +91,13 @@ public class TrafficReportService extends BaseLogService { public Map getBandwidthTransByQuoTaType(TrafficTransStatisticCK trafficTransStatisticCK) { List list = null; List timeList = null; + if ((DateUtil.convertStringToDate(trafficTransStatisticCK.getEndDate(), TimeConstants.YYYY_MM_DD_HH24_MM_SS) + .getTime()) + - (DateUtil.convertStringToDate(trafficTransStatisticCK.getBeginDate(), + TimeConstants.YYYY_MM_DD_HH24_MM_SS).getTime()) > (7 * 24 * 60 * 60 * 1000L)) { + + trafficTransStatisticCK.setSearchBusinessType(2); + } Integer searchBusinessType = trafficTransStatisticCK.getSearchBusinessType(); if (searchBusinessType == 1) { timeList = DateUtils.getTimeInterval(trafficTransStatisticCK.getBeginDate(),