From bbfc850b83fd63b84df02ee8a90c4944bd9ab81f Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@intranet.com>
Date: Thu, 13 Sep 2018 16:10:10 +0800
Subject: [PATCH] =?UTF-8?q?ntc=5Fpz=5Freport=E9=85=8D=E7=BD=AE=E5=91=BD?=
 =?UTF-8?q?=E4=B8=AD=E6=80=BB=E9=87=8F=E4=B8=9A=E5=8A=A1=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E4=B8=AD=E4=B8=8D=E5=8F=96report=5Ftime?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/dao/NtcReportDao.xml     | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/NtcReportDao.xml b/src/main/java/com/nis/web/dao/NtcReportDao.xml
index 8ba705a..f653798 100644
--- a/src/main/java/com/nis/web/dao/NtcReportDao.xml
+++ b/src/main/java/com/nis/web/dao/NtcReportDao.xml
@@ -58,16 +58,33 @@
 		resultMap="NtcPzReportMap">
 		SELECT
 		<choose>
-			<when test="page !=null and page.fields != null and page.fields != ''">
-				${page.fields}
+			<when test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 1 ">
+				<choose>
+					<when test="page !=null and page.fields != null and page.fields != ''">
+						${page.fields}
+					</when>
+					<otherwise>
+						CFG_ID,SERVICE,SUM
+					</otherwise>
+				</choose>
+				FROM (SELECT CFG_ID,SERVICE,SUM(SUM) SUM
+					FROM 	
 			</when>
 			<otherwise>
-				CFG_ID,
-				<include refid="commonPorperty" />
+				<choose>
+					<when test="page !=null and page.fields != null and page.fields != ''">
+						${page.fields}
+					</when>
+					<otherwise>
+						CFG_ID,
+						<include refid="commonPorperty" />
+					</otherwise>
+				</choose>
+				FROM (SELECT CFG_ID, SERVICE, SUM(SUM) SUM ,REPORT_TIME
+					FROM 
 			</otherwise>
 		</choose>
-		FROM (SELECT CFG_ID, SERVICE, SUM(SUM) SUM ,REPORT_TIME
-			FROM 
+		
 		<choose>
 			<when test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 3 ">
 				NTC_PZ_STAT_HOUR