解决VIEW中ID报错，修改修改统一JMX中SQL格式

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/AdvancePaymentBalanceSumAdvQuery.jmx

@@ -11,9 +11,30 @@
 		<template>
 			<sql-type>SQL</sql-type>
 			<sql>
-						 SELECT
-					PurchaseSandCompany.NAME AS purchaseSandUnit,
-					ProjectFiled.projectName AS project,
+			SELECT
+					result.purchaseSandUnit AS purchaseSandUnit,
+					result.project AS project,
+					result.lastYearAdvance AS lastYearAdvance,
+					result.paymentSales AS paymentSales,
+					result.totalAdvancePayment AS totalAdvancePayment,
+					result.refundAmount AS refundAmount,
+					result.advanceBalance AS advanceBalance,
+					result.janAmount as janAmount,
+					result.febAmount as febAmount,
+					result.marAmount as marAmount,
+					result.aprAmount as aprAmount,
+					result.mayAmount as mayAmount,
+					result.junAmount as junAmount,
+					result.julAmount as julAmount,
+					result.augAmount as augAmount,
+					result.septAmount as septAmount,
+					result.octAmount as octAmount,
+					result.novAmount as novAmount,
+					result.decAmount as decAmount
+				FROM			
+				(SELECT
+					purchaseSandCompany.NAME AS purchaseSandUnit,
+					projectFiled.projectName AS project,
 					SUM(AdvancePaymentAndBalanceSummary.lastYearAdvance) AS lastYearAdvance,
 					SUM(AdvancePaymentAndBalanceSummary.paymentSales) AS paymentSales,
 					SUM(AdvancePaymentAndBalanceSummary.totalAdvancePayment) AS totalAdvancePayment,
@@ -30,135 +51,159 @@
 					septAmount.septAmount1 as septAmount,
 					octAmount.octAmount1 as octAmount,
 					novAmount.novAmount1 as novAmount,
-					decAmount.decAmount1 as decAmount
+					decAmount.decAmount1 as decAmount,
+					AdvancePaymentAndBalanceSummary.dealYear AS dealYear,
+					AdvancePaymentAndBalanceSummary.regionalCompany AS regionalCompany
 				FROM
 					AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
-					LEFT JOIN PurchaseSandCompany AS PurchaseSandCompany ON PurchaseSandCompany.id =  AdvancePaymentAndBalanceSummary.purchaseSandUnit
-					LEFT JOIN ProjectFiled AS ProjectFiled ON ProjectFiled.id = AdvancePaymentAndBalanceSummary.project
+					LEFT JOIN PurchaseSandCompany AS purchaseSandCompany ON purchaseSandCompany.id =  AdvancePaymentAndBalanceSummary.purchaseSandUnit
+					LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = AdvancePaymentAndBalanceSummary.project
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 1   
-						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS janAmount ON janAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					AND janAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND janAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 2   
-						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS febAmount ON febAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					AND febAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND febAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
-						AdvancePaymentAndBalanceSummary1.dealMonth = 3   
-						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+						AdvancePaymentAndBalanceSummary1.dealMonth = 3  
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS marAmount ON marAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					AND marAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND marAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 4
-						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS aprAmount ON aprAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					AND aprAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND aprAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
-						AdvancePaymentAndBalanceSummary1.dealMonth = 5   
-						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+						AdvancePaymentAndBalanceSummary1.dealMonth = 5 
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS mayAmount ON mayAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					AND mayAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND mayAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
-						AdvancePaymentAndBalanceSummary1.dealMonth = 6   
-						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+						AdvancePaymentAndBalanceSummary1.dealMonth = 6 
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS junAmount ON junAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					AND junAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND junAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 7   
-						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS julAmount ON julAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					AND julAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND julAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 8   
-						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS augAmount ON augAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					AND augAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND augAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 9   
-						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS septAmount ON septAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					AND septAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND septAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 10   
-						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS octAmount ON octAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					AND octAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND octAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
@@ -167,20 +212,22 @@
 						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS novAmount ON novAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					AND novAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND novAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount1 ,
-						AdvancePaymentAndBalanceSummary1.project  AS project1
+						AdvancePaymentAndBalanceSummary1.project  AS project1,
+						AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
-						AdvancePaymentAndBalanceSummary1.dealMonth = 12   
-						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+						AdvancePaymentAndBalanceSummary1.dealMonth = 12
 						GROUP BY AdvancePaymentAndBalanceSummary1.project
 					) AS decAmount ON decAmount.project1 = AdvancePaymentAndBalanceSummary.project
-					WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year 
-					AND AdvancePaymentAndBalanceSummary.regionalCompany = :?regionalCompanyName
+					AND decAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND decAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					GROUP BY AdvancePaymentAndBalanceSummary.project
 				UNION ALL
 					SELECT
@@ -202,132 +249,147 @@
 					septAmount.septAmount1 as septAmount,
 					octAmount.octAmount1 as octAmount,
 					novAmount.novAmount1 as novAmount,
-					decAmount.decAmount1 as decAmount		
+					decAmount.decAmount1 as decAmount,
+					AdvancePaymentAndBalanceSummary.dealYear AS dealYear,
+					AdvancePaymentAndBalanceSummary.regionalCompany AS regionalCompany		
 				FROM
 					AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 1   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS janAmount ON janAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND janAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 2   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS febAmount ON febAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND febAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 3   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS marAmount ON marAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND marAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 4   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS aprAmount ON aprAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND aprAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 5   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS mayAmount ON mayAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND mayAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 6   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS junAmount ON junAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND junAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 7   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS julAmount ON julAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND julAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 8   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS augAmount ON augAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND augAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 9   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS septAmount ON septAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND septAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 10   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS octAmount ON octAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND octAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 11   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS novAmount ON novAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					AND novAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					LEFT JOIN(
 					SELECT
 						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount1 ,
-				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1,
+						AdvancePaymentAndBalanceSummary1.regionalCompany AS regionalCompany1
 					FROM
 						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 					WHERE
 						AdvancePaymentAndBalanceSummary1.dealMonth = 12   
-						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
 					) AS decAmount ON decAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-					WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year 
-					AND AdvancePaymentAndBalanceSummary.regionalCompany = :?regionalCompanyName
-					ORDER BY :?totalGroupBy 
+					AND decAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
+					) AS result
+					WHERE result.dealYear = :?year
+					AND result.regionalCompany = :?regionalCompanyId
+					ORDER BY :?totalGroupBy
 				</sql>
 		</template>
 	</content>

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/AdvancePaymentBalanceSumQueryView.jmx

@@ -50,23 +50,12 @@
                     "table": {
                         "selectType": "MULTI",
                         "serialNumber": "series",
-                        "pageSize": 200,
+                        "pageSize": 10,
                         "orders":[
                            
                         ],
                         "expand": false,
                         "columns": [
-                        	{
-                                "type": "VALUE",
-                                "title": "id",
-                                "key": "id",
-                                "columnType": {
-                                    "name" : "inner",
-                                    "data": {
-                                        "selected": true
-                                    }
-                                }
-                            },
                             {
                                 "type": "VALUE",
                                 "title": "购砂单位",
@@ -125,7 +114,7 @@
                             {
                                 "type": "VALUE",
                                 "title": "本年累计退费",
-                                "key": "fundAmount",
+                                "key": "refundAmount",
                                 "columnType": {
                                     "name": "select",
                                     "data": {

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsQueryView.jmx

@@ -50,23 +50,12 @@
                     "table": {
                         "selectType": "MULTI",
                         "serialNumber": "series",
-                        "pageSize": 200,
+                        "pageSize": 10,
                         "orders":[
                            
                         ],
                         "expand": false,
                         "columns": [
-                        	{
-                                "type": "VALUE",
-                                "title": "id",
-                                "key": "id",
-                                "columnType": {
-                                    "name" : "inner",
-                                    "data": {
-                                        "selected": true
-                                    }
-                                }
-                            },
                             {
                                 "type": "VALUE",
                                 "title": "场站",

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsQueryView.jmx

@@ -50,23 +50,12 @@
                     "table": {
                         "selectType": "MULTI",
                         "serialNumber": "series",
-                        "pageSize": 200,
+                        "pageSize": 10,
                         "orders":[
                            
                         ],
                         "expand": false,
                         "columns": [
-                        	{
-                                "type": "VALUE",
-                                "title": "id",
-                                "key": "id",
-                                "columnType": {
-                                    "name" : "inner",
-                                    "data": {
-                                        "selected": true
-                                    }
-                                }
-                            },
                             {
                                 "type": "VALUE",
                                 "title": "场站",

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/PaymentDetailsAdvQuery.jmx

@@ -36,13 +36,12 @@
 				financeRefund.refundExplain AS remark ,
 				financeRefund.regionalCompany AS regionalCompanyId,
 				purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
-				projectFiled.projectName AS projectName,
 				CASE WHEN financeRefund.fundType = 1 THEN 'DEPOSIT' ELSE 'ADVANCE' END  AS fundType1
 			FROM
 				FinanceRefund AS financeRefund
 				LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = financeRefund.purchaseSandCompany
 				LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = financeRefund.project 
-			UNION ALL
+				UNION ALL
 		    SELECT
 				artificialRecharge.id AS id,
 				artificialRecharge.createTime AS createTime,
@@ -58,13 +57,11 @@
 				artificialRecharge.remark AS remark ,
 				artificialRecharge.regionalCompany AS regionalCompanyId,
 				purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
-				projectFiled.projectName AS projectName,
 				artificialRecharge.fundType AS fundType1 
 			FROM
 				ArtificialRecharge AS artificialRecharge
 				LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = artificialRecharge.purchaseSandUnit
-				LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = artificialRecharge.project	 
-				UNION ALL
+				LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = artificialRecharge.project UNION ALL
 			SELECT
 				expenseAdjust.id AS id,
 				expenseAdjust.createTime AS createTime,
@@ -89,7 +86,6 @@
 				expenseAdjust.remark AS remark,
 				expenseAdjust.regionalCompany AS regionalCompanyId,
 				purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
-				projectFiled.projectName AS projectName,
 				expenseAdjust.fundType AS fundType1  
 				FROM
 					ExpenseAdjust AS expenseAdjust
@@ -99,10 +95,10 @@
 				WHERE result.regionalCompanyId = :?regionalCompanyId 
 				AND ( result.createTime >= :?startDate AND result.createTime <= :?endDate )				
 				AND result.purchaseSandCompanyonName LIKE :?purchaseSandCompanyonName			
-                AND result.projectName LIKE :?projectName
+                AND result.project LIKE :?projectName
 				AND result.fundType1 = :?fundType
 				ORDER BY result.createTime DESC
 		    </sql>
 		</template>
 	</content>
-</metadata>
+</metadata>
\ No newline at end of file

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/PaymentDetailsQueryView.jmx

@@ -50,7 +50,7 @@
                     "table": {
                         "selectType": "MULTI",
                         "serialNumber": "series",
-                        "pageSize": 200,
+                        "pageSize": 10,
                         "orders":[
                            
                         ],

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesSummaryAdvQuery.jmx

@@ -11,12 +11,32 @@
 		<template>
 			<sql-type>SQL</sql-type>
 			<sql>
-					SELECT
+		SELECT
+			result.station AS station,
+			result.dinasType AS dinasType,
+			result.saleDealAmount AS saleDealAmount,
+			result.saleAmount AS saleAmount,
+			result.avgAmount AS avgAmount,
+			result.janAmount AS janAmount,
+			result.febAmount AS febAmount,
+			result.marAmount AS marAmount,
+			result.aprAmount AS aprAmount,
+			result.mayAmount AS mayAmount,
+			result.junAmount AS junAmount,
+			result.julAmount AS julAmount,
+			result.augAmount AS augAmount,
+			result.septAmount AS septAmount,
+			result.octAmount AS octAmount,
+			result.novAmount AS novAmount,
+			result.decAmount AS decAmount
+        FROM			
+			(
+			SELECT
 				'总计' as station,
-				'-' as dinasType,
-				SUM( salesSummary.saleDealAmount ) as saleDealAmount,
-				SUM( salesSummary.saleAmount ) as saleAmount,
-				'-'  as avgAmount,
+				'--' as dinasType,
+				SUM(salesSummary.saleDealAmount) as saleDealAmount,
+				SUM(salesSummary.saleAmount) as saleAmount,
+				'--' as avgAmount,
 				janAmount.janAmount1 as janAmount,
 				febAmount.febAmount1 as febAmount,
 				marAmount.marAmount1 as marAmount,
@@ -28,121 +48,144 @@
 				septAmount.septAmount1 as septAmount,
 				octAmount.octAmount1 as octAmount,
 				novAmount.novAmount1 as novAmount,
-				decAmount.decAmount1 as decAmount
+				decAmount.decAmount1 as decAmount,
+				salesSummary.dealYear AS dealYear
 			FROM
-				SalesSummary as salesSummary
-				LEFT JOIN Station station ON station.id = salesSummary.station
-				LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType 
+				SalesSummary AS salesSummary
+				LEFT JOIN Station AS station ON station.id = salesSummary.station 
+				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
 				LEFT JOIN (
 				SELECT
-				    salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS janAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS janAmount1 ,
+					salesSummary1.dealYear AS dealYear1
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 1 
-				) AS janAmount ON  janAmount.dealYear1 = salesSummary.dealYear
+					GROUP BY salesSummary1.station
+				) AS janAmount ON  janAmount.dealYear1 = salesSummary.dealYear	
 			LEFT JOIN (
 				SELECT
-				    salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS febAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS febAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 2 
-				) AS febAmount ON  febAmount.dealYear1 = salesSummary.dealYear
+					GROUP BY salesSummary1.station 
+				) AS febAmount ON   febAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
-				   salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS marAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS marAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 3 
-				) AS marAmount ON  marAmount.dealYear1 = salesSummary.dealYear
+					GROUP BY salesSummary1.station 
+				) AS marAmount ON   marAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
-				    salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS aprAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS aprAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary  AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 4 
+					GROUP BY salesSummary1.station 
 				) AS aprAmount ON  aprAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
-				   salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS mayAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS mayAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 5 
-				) AS mayAmount ON  mayAmount.dealYear1 = salesSummary.dealYear	
+					GROUP BY salesSummary1.station 
+				) AS mayAmount ON   mayAmount.dealYear1 = salesSummary.dealYear	
 			LEFT JOIN (
 				SELECT
-				    salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS junAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS junAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 6 
-				) AS junAmount ON  junAmount.dealYear1 = salesSummary.dealYear	
+					GROUP BY salesSummary1.station 
+				) AS junAmount ON   junAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
-				    salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS julAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS julAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 7 
-				) AS julAmount ON  julAmount.dealYear1 = salesSummary.dealYear
+					GROUP BY salesSummary1.station 
+				) AS julAmount ON   julAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
-				    salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS augAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS augAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 8 
-				) AS augAmount ON  augAmount.dealYear1 = salesSummary.dealYear	
+					GROUP BY salesSummary1.station 
+				) AS augAmount ON   augAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
-				    salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS septAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS septAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 9 
-				) AS septAmount ON  septAmount.dealYear1 = salesSummary.dealYear
+					GROUP BY salesSummary1.station 
+				) AS septAmount ON   septAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
-				    salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS octAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS octAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 10 
-				) AS octAmount ON  octAmount.dealYear1 = salesSummary.dealYear
+					GROUP BY salesSummary1.station 
+				) AS octAmount ON   octAmount.dealYear1 = salesSummary.dealYear	
 			LEFT JOIN (
 				SELECT
-				    salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS novAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS novAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 11 
-				) AS novAmount ON  novAmount.dealYear1 = salesSummary.dealYear
+					GROUP BY salesSummary1.station 
+				) AS novAmount ON   novAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
-				    salesSummary1.dealYear as dealYear1,
-					SUM( salesSummary1.saleAmount ) AS decAmount1 
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS decAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 12 
+					GROUP BY salesSummary1.station
 				) AS decAmount ON  decAmount.dealYear1 = salesSummary.dealYear
-				where salesSummary.dealYear = :?year
-				AND salesSummary.station IN ( :?stationList )
 				GROUP BY salesSummary.dealYear
 			UNION ALL
 			SELECT
@@ -150,7 +193,7 @@
 				'小计' as dinasType,
 				SUM(salesSummary.saleDealAmount) as saleDealAmount,
 				SUM(salesSummary.saleAmount) as saleAmount,
-				'-' as avgAmount,
+				'--' as avgAmount,
 				janAmount.janAmount1 as janAmount,
 				febAmount.febAmount1 as febAmount,
 				marAmount.marAmount1 as marAmount,
@@ -162,146 +205,157 @@
 				septAmount.septAmount1 as septAmount,
 				octAmount.octAmount1 as octAmount,
 				novAmount.novAmount1 as novAmount,
-				decAmount.decAmount1 as decAmount
+				decAmount.decAmount1 as decAmount,
+				salesSummary.dealYear AS dealYear
 			FROM
-				SalesSummary salesSummary
-				LEFT JOIN Station station ON station.id = salesSummary.station 
-				LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType
+				SalesSummary AS salesSummary
+				LEFT JOIN Station AS station ON station.id = salesSummary.station 
+				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
 				LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS janAmount1 
+					SUM( salesSummary1.saleAmount ) AS janAmount1 ,
+					salesSummary1.dealYear AS dealYear1
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 1 
-					AND salesSummary1.dealYear = :?year  
 					GROUP BY salesSummary1.station
-				) AS janAmountTab ON  janAmount.station1 = salesSummary.station	
+				) AS janAmount ON  janAmount.station1 = salesSummary.station
+				AND janAmount.dealYear1 = salesSummary.dealYear	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS febAmount1 
+					SUM( salesSummary1.saleAmount ) AS febAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 2 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station 
 				) AS febAmount ON  febAmount.station1 = salesSummary.station
+				AND febAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS marAmount1 
+					SUM( salesSummary1.saleAmount ) AS marAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 3 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station 
 				) AS marAmount ON  marAmount.station1 = salesSummary.station
+				AND marAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS aprAmount1 
+					SUM( salesSummary1.saleAmount ) AS aprAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary  AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 4 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station 
 				) AS aprAmount ON  aprAmount.station1 = salesSummary.station
+				AND aprAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS mayAmount1 
+					SUM( salesSummary1.saleAmount ) AS mayAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 5 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station 
-				) AS mayAmount ON  mayAmount.station1 = salesSummary.station	
+				) AS mayAmount ON  mayAmount.station1 = salesSummary.station
+				AND mayAmount.dealYear1 = salesSummary.dealYear	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS junAmount1 
+					SUM( salesSummary1.saleAmount ) AS junAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 6 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station 
-				) AS junAmount ON  junAmount.station1 = salesSummary.station 	
+				) AS junAmount ON  junAmount.station1 = salesSummary.station
+				AND junAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS julAmount1 
+					SUM( salesSummary1.saleAmount ) AS julAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 7 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station 
 				) AS julAmount ON  julAmount.station1 = salesSummary.station
+				AND julAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS augAmount1 
+					SUM( salesSummary1.saleAmount ) AS augAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 8 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station 
-				) AS augAmount ON  augAmount.station1 = salesSummary.station 	
+				) AS augAmount ON  augAmount.station1 = salesSummary.station
+				AND augAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS septAmount1 
+					SUM( salesSummary1.saleAmount ) AS septAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 9 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station 
 				) AS septAmount ON  septAmount.station1 = salesSummary.station
+				AND septAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS octAmount1 
+					SUM( salesSummary1.saleAmount ) AS octAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 10 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station 
-				) AS octAmount ON  octAmount.station1 = salesSummary.station	
+				) AS octAmount ON  octAmount.station1 = salesSummary.station
+				AND octAmount.dealYear1 = salesSummary.dealYear	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS novAmount1 
+					SUM( salesSummary1.saleAmount ) AS novAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 11 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station 
 				) AS novAmount ON  novAmount.station1 = salesSummary.station
+				AND novAmount.dealYear1 = salesSummary.dealYear
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS decAmount1 
+					SUM( salesSummary1.saleAmount ) AS decAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 12 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station
 				) AS decAmount ON  decAmount.station1 = salesSummary.station
-				where salesSummary.dealYear = :?year
-			    AND salesSummary.station IN ( :?stationList )
-				GROUP BY station
+				AND decAmount.dealYear1 = salesSummary.dealYear
+				GROUP BY salesSummary.station
 			UNION ALL
 			SELECT
 				station.stationName as station,
@@ -320,160 +374,170 @@
 				septAmount.septAmount1 as septAmount,
 				octAmount.octAmount1 as octAmount,
 				novAmount.novAmount1 as novAmount,
-				decAmount.decAmount1 as decAmount
+				decAmount.decAmount1 as decAmount,
+				salesSummary.dealYear AS dealYear
 			FROM
 				SalesSummary salesSummary
-				LEFT JOIN Station station ON station.id = salesSummary.station 
-				LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType 
+				LEFT JOIN Station AS station ON station.id = salesSummary.station 
+				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
 				LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS janAmount1 
+					SUM( salesSummary1.saleAmount ) AS janAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 1 
-					AND salesSummary1.dealYear = :?year
 					GROUP BY salesSummary1.station,salesSummary1.dinasType 
-				) AS janAmountTab ON  janAmount.station1 = salesSummary.station AND janAmount.dinasType1 = salesSummary.dinasType 	
+				) AS janAmount ON  janAmount.station1 = salesSummary.station AND janAmount.dinasType1 = salesSummary.dinasType
+				AND janAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS febAmount1 
+					SUM( salesSummary1.saleAmount ) AS febAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 2 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station,salesSummary1.dinasType
-				) AS febAmount ON  febAmount.station1 = salesSummary.station AND febAmount.dinasType1 = salesSummary.dinasType 	
+				) AS febAmount ON  febAmount.station1 = salesSummary.station AND febAmount.dinasType1 = salesSummary.dinasType
+				AND febAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS marAmount1 
+					SUM( salesSummary1.saleAmount ) AS marAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 3 
-					AND salesSummary1.dealYear = :?year
 					GROUP BY salesSummary1.station,salesSummary1.dinasType 
-				) AS marAmount ON  marAmount.station1 = salesSummary.station AND marAmount.dinasType1 = salesSummary.dinasType 	
+				) AS marAmount ON  marAmount.station1 = salesSummary.station AND marAmount.dinasType1 = salesSummary.dinasType
+				AND marAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS aprAmount1 
+					SUM( salesSummary1.saleAmount ) AS aprAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 4 
-					AND salesSummary1.dealYear = :?year
 					GROUP BY salesSummary1.station,salesSummary1.dinasType 
-				) AS aprAmount ON  aprAmount.station1 = salesSummary.station AND aprAmount.dinasType1 = salesSummary.dinasType 	
+				) AS aprAmount ON  aprAmount.station1 = salesSummary.station AND aprAmount.dinasType1 = salesSummary.dinasType
+				AND aprAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS mayAmount1 
+					SUM( salesSummary1.saleAmount ) AS mayAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 5 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station,salesSummary1.dinasType
-				) AS mayAmount ON  mayAmount.station1 = salesSummary.station AND mayAmount.dinasType1 = salesSummary.dinasType 	
+				) AS mayAmount ON  mayAmount.station1 = salesSummary.station AND mayAmount.dinasType1 = salesSummary.dinasType
+				AND mayAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS junAmount1 
+					SUM( salesSummary1.saleAmount ) AS junAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 6 
-					AND salesSummary1.dealYear = :?year
 					GROUP BY salesSummary1.station,salesSummary1.dinasType 
-				) AS junAmount ON  junAmount.station1 = salesSummary.station AND junAmount.dinasType1 = salesSummary.dinasType 	
+				) AS junAmount ON  junAmount.station1 = salesSummary.station AND junAmount.dinasType1 = salesSummary.dinasType
+				AND junAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS julAmount1 
+					SUM( salesSummary1.saleAmount ) AS julAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 7 
-					AND salesSummary1.dealYear = :?year
 					GROUP BY salesSummary1.station,salesSummary1.dinasType 
-				) AS julAmount ON  julAmount.station1 = salesSummary.station AND julAmount.dinasType1 = salesSummary.dinasType 	
+				) AS julAmount ON  julAmount.station1 = salesSummary.station AND julAmount.dinasType1 = salesSummary.dinasType
+				AND julAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS augAmount1 
+					SUM( salesSummary1.saleAmount ) AS augAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 8 
-					AND salesSummary1.dealYear = :?year
 					GROUP BY salesSummary1.station,salesSummary1.dinasType 
-				) AS augAmount ON  augAmount.station1 = salesSummary.station AND augAmount.dinasType1 = salesSummary.dinasType 	
+				) AS augAmount ON  augAmount.station1 = salesSummary.station AND augAmount.dinasType1 = salesSummary.dinasType
+				AND augAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS septAmount1 
+					SUM( salesSummary1.saleAmount ) AS septAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 9 
-					AND salesSummary1.dealYear = :?year
 					GROUP BY salesSummary1.station,salesSummary1.dinasType 
-				) AS septAmount ON  septAmount.station1 = salesSummary.station AND septAmount.dinasType1 = salesSummary.dinasType 	
+				) AS septAmount ON  septAmount.station1 = salesSummary.station AND septAmount.dinasType1 = salesSummary.dinasType
+				AND septAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS octAmount1 
+					SUM( salesSummary1.saleAmount ) AS octAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 10 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station,salesSummary1.dinasType
-				) AS octAmount ON  octAmount.station1 = salesSummary.station AND octAmount.dinasType1 = salesSummary.dinasType 	
+				) AS octAmount ON  octAmount.station1 = salesSummary.station AND octAmount.dinasType1 = salesSummary.dinasType
+				AND octAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS novAmount1 
+					SUM( salesSummary1.saleAmount ) AS novAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 11 
-					AND salesSummary1.dealYear = :?year
 					GROUP BY salesSummary1.station,salesSummary1.dinasType 
-				) AS novAmount ON  novAmount.station1 = salesSummary.station AND novAmount.dinasType1 = salesSummary.dinasType 	
+				) AS novAmount ON  novAmount.station1 = salesSummary.station AND novAmount.dinasType1 = salesSummary.dinasType
+				AND novAmount.dealYear1 = salesSummary.dealYear 	
 			LEFT JOIN (
 				SELECT
 				    salesSummary1.dinasType AS dinasType1,
 				    salesSummary1.station AS station1 , 
-					SUM( salesSummary1.saleAmount ) AS decAmount1 
+					SUM( salesSummary1.saleAmount ) AS decAmount1,
+					salesSummary1.dealYear AS dealYear1 
 				FROM
-					SalesSummary salesSummary1 
+					SalesSummary AS salesSummary1 
 					WHERE
 					salesSummary1.dealMonth = 12 
-					AND salesSummary1.dealYear = :?year 
 					GROUP BY salesSummary1.station,salesSummary1.dinasType
-				) AS decAmount ON  decAmount.station1 = salesSummary.station AND decAmount.dinasType1 = salesSummary.dinasType 
-				WHERE salesSummary.dealYear = :?year
-				AND salesSummary.station IN ( :?stationList )
-				GROUP BY station,dinasType
-			    ORDER BY :?totalGroupBy , :?subtotalGroupBy ,
-				station,saleDealAmount DESC
+				) AS decAmount ON  decAmount.station1 = salesSummary.station AND decAmount.dinasType1 = salesSummary.dinasType
+				AND decAmount.dealYear1 = salesSummary.dealYear 				
+				) AS result
+			
 				</sql>
 		</template>
 	</content>

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesSummaryQueryView.jmx

@@ -50,23 +50,12 @@
                     "table": {
                         "selectType": "MULTI",
                         "serialNumber": "series",
-                        "pageSize": 200,
+                        "pageSize": 10,
                         "orders":[
                            
                         ],
                         "expand": false,
                         "columns": [
-                        	{
-                                "type": "VALUE",
-                                "title": "id",
-                                "key": "id",
-                                "columnType": {
-                                    "name" : "inner",
-                                    "data": {
-                                        "selected": true
-                                    }
-                                }
-                            },
                             {
                                 "type": "VALUE",
                                 "title": "场站",