diff --git a/src/main/java/com/nis/web/dao/NtcReportDao.xml b/src/main/java/com/nis/web/dao/NtcReportDao.xml
index 3ee6922..6c8faca 100644
--- a/src/main/java/com/nis/web/dao/NtcReportDao.xml
+++ b/src/main/java/com/nis/web/dao/NtcReportDao.xml
@@ -67,7 +67,19 @@
FROM (SELECT CFG_ID, SERVICE, SUM(SUM) SUM ,REPORT_TIME
- FROM NTC_PZ_REPORT
+ FROM
+
+
+ NTC_PZ_STAT_HOUR
+
+
+ NTC_PZ_STAT_DAILY
+
+
+ NTC_PZ_REPORT
+
+
+
@@ -82,16 +94,28 @@
-
-
- GROUP BY CFG_ID,SERVICE
+
+
+ GROUP BY CFG_ID,SERVICE
)
-
-
- GROUP BY CFG_ID,SERVICE,REPORT_TIME
+
+
+ GROUP BY CFG_ID,SERVICE,REPORT_TIME
)
-
- NTC_PZ_REPORT
+
+
+
+
+
+ NTC_PZ_STAT_HOUR
+
+
+ NTC_PZ_STAT_DAILY
+
+
+ NTC_PZ_REPORT
+
+
ORDER BY ${page.orderBy}
@@ -110,7 +134,19 @@
FROM (SELECT SERVICE, SUM(SUM) SUM ,REPORT_TIME
- FROM NTC_SERVICE_REPORT
+ FROM
+
+
+
+ NTC_SERVICE_STAT_HOUR
+
+
+ NTC_SERVICE_STAT_DAILY
+
+
+ NTC_SERVICE_REPORT
+
+
@@ -123,11 +159,20 @@
-
GROUP BY SERVICE,REPORT_TIME
)
-
- NTC_SERVICE_REPORT
+
+
+
+ NTC_SERVICE_STAT_HOUR
+
+
+ NTC_SERVICE_STAT_DAILY
+
+
+ NTC_SERVICE_REPORT
+
+
ORDER BY ${page.orderBy}
@@ -148,7 +193,19 @@
FROM (SELECT SERVICE,TAG,SUM(SUM) SUM ,REPORT_TIME
- FROM NTC_TAG_REPORT
+ FROM
+
+
+
+ NTC_TAG_STAT_HOUR
+
+
+ NTC_TAG_STAT_DAILY
+
+
+ NTC_TAG_REPORT
+
+
@@ -164,11 +221,19 @@
-
GROUP BY SERVICE,TAG,REPORT_TIME
)
-
- NTC_TAG_REPORT
+
+
+ NTC_TAG_STAT_HOUR
+
+
+ NTC_TAG_STAT_DAILY
+
+
+ NTC_TAG_REPORT
+
+
ORDER BY ${page.orderBy}
@@ -189,7 +254,19 @@
FROM (SELECT SERVICE,ATTR_TYPE, SUM(SUM) SUM ,REPORT_TIME
- FROM NTC_ATTR_TYPE_REPORT
+ FROM
+
+
+
+ NTC_ATTR_TYPE_STAT_HOUR
+
+
+ NTC_ATTR_TYPE_STAT_DAILY
+
+
+ NTC_ATTR_TYPE_REPORT
+
+
@@ -205,11 +282,20 @@
-
GROUP BY SERVICE,ATTR_TYPE,REPORT_TIME
)
-
- NTC_ATTR_TYPE_REPORT
+
+
+
+ NTC_ATTR_TYPE_STAT_HOUR
+
+
+ NTC_ATTR_TYPE_STAT_DAILY
+
+
+ NTC_ATTR_TYPE_REPORT
+
+
ORDER BY ${page.orderBy}
@@ -230,7 +316,18 @@
FROM (SELECT SERVICE,LWHH, SUM(SUM) SUM ,REPORT_TIME
- FROM NTC_LWHH_REPORT
+ FROM
+
+
+ NTC_LWHH_STAT_HOUR
+
+
+ NTC_LWHH_STAT_DAILY
+
+
+ NTC_LWHH_REPORT
+
+
@@ -246,11 +343,19 @@
-
GROUP BY SERVICE,LWHH,REPORT_TIME
)
-
- NTC_LWHH_REPORT
+
+
+ NTC_LWHH_STAT_HOUR
+
+
+ NTC_LWHH_STAT_DAILY
+
+
+ NTC_LWHH_REPORT
+
+
ORDER BY ${page.orderBy}
@@ -270,7 +375,18 @@
FROM (SELECT SERVICE,SRC_PROVINCE,SRC_CITY, SUM(SUM) SUM ,REPORT_TIME
- FROM NTC_SRCIP_DOMESTIC_REPORT
+ FROM
+
+
+ NTC_SRCIP_DOMESTIC_STAT_HOUR
+
+
+ NTC_SRCIP_DOMESTIC_STAT_DAILY
+
+
+ NTC_SRCIP_DOMESTIC_REPORT
+
+
@@ -283,11 +399,19 @@
-
GROUP BY SERVICE,SRC_PROVINCE,SRC_CITY,REPORT_TIME
)
-
- NTC_SRCIP_DOMESTIC_REPORT
+
+
+ NTC_SRCIP_DOMESTIC_STAT_HOUR
+
+
+ NTC_SRCIP_DOMESTIC_STAT_DAILY
+
+
+ NTC_SRCIP_DOMESTIC_REPORT
+
+
ORDER BY ${page.orderBy}
@@ -308,7 +432,18 @@
FROM (SELECT SERVICE,DEST_COUNTRY, SUM(SUM) SUM ,REPORT_TIME
- FROM NTC_DESTIP_COUNTRY_REPORT
+ FROM
+
+
+ NTC_DESTIP_COUNTRY_STAT_HOUR
+
+
+ NTC_DESTIP_COUNTRY_STAT_DAILY
+
+
+ NTC_DESTIP_COUNTRY_REPORT
+
+
@@ -321,11 +456,19 @@
-
GROUP BY SERVICE,DEST_COUNTRY,REPORT_TIME
)
-
- NTC_DESTIP_COUNTRY_REPORT
+
+
+ NTC_DESTIP_COUNTRY_STAT_HOUR
+
+
+ NTC_DESTIP_COUNTRY_STAT_DAILY
+
+
+ NTC_DESTIP_COUNTRY_REPORT
+
+
ORDER BY ${page.orderBy}
@@ -346,7 +489,18 @@
FROM (SELECT SERVICE,ENTRANCE_ID, SUM(SUM) SUM ,REPORT_TIME
- FROM NTC_ENTRANCE_REPORT
+ FROM
+
+
+ NTC_ENTRANCE_STAT_HOUR
+
+
+ NTC_ENTRANCE_STAT_DAILY
+
+
+ NTC_ENTRANCE_REPORT
+
+
@@ -363,11 +517,19 @@
-
GROUP BY SERVICE,ENTRANCE_ID,REPORT_TIME
)
-
- NTC_ENTRANCE_REPORT
+
+
+ NTC_ENTRANCE_STAT_HOUR
+
+
+ NTC_ENTRANCE_STAT_DAILY
+
+
+ NTC_ENTRANCE_REPORT
+
+
ORDER BY ${page.orderBy}
diff --git a/src/main/java/com/nis/web/service/restful/NtcReportService.java b/src/main/java/com/nis/web/service/restful/NtcReportService.java
index 07b2365..fe1bc62 100644
--- a/src/main/java/com/nis/web/service/restful/NtcReportService.java
+++ b/src/main/java/com/nis/web/service/restful/NtcReportService.java
@@ -50,10 +50,9 @@ public class NtcReportService extends BaseLogService {
pageTotal.setCount(restList.size());
pageTotal.setList(restList);
return pageTotal;
- } else if ("2".equals(entity.getSearchBusinessType())) {
+ } else{
return page;
}
- return null;
}