From fad510f43f9bff65fd8409e88a6d3f9bdc44b315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= Date: Mon, 17 Jun 2019 17:26:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E5=B8=A6=E5=AE=BD=E7=BB=9F=E8=AE=A1=E4=BA=94=E5=88=86=E9=92=9F?= =?UTF-8?q?=20=E5=A6=82=E6=9E=9C=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E5=A4=A7=E4=BA=8E7=E5=A4=A9=E5=B0=B1=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=B0=8F=E6=97=B6=E7=B2=92=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/service/restful/TrafficReportService.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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(),