调整统计SQL格式，增加group by条件参数

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

@@ -11,322 +11,323 @@
 		<template>
 			<sql-type>SQL</sql-type>
 			<sql>
-		 SELECT
-	PurchaseSandCompany.NAME AS purchaseSandUnit,
-	ProjectFiled.projectName AS project,
-	SUM(AdvancePaymentAndBalanceSummary.lastYearAdvance) AS lastYearAdvance,
-	SUM(AdvancePaymentAndBalanceSummary.paymentSales) AS paymentSales,
-	SUM(AdvancePaymentAndBalanceSummary.totalAdvancePayment) AS totalAdvancePayment,
-	SUM(AdvancePaymentAndBalanceSummary.advancePaymentRefundAmount + AdvancePaymentAndBalanceSummary.marginRefund) AS refundAmount,
-	SUM(AdvancePaymentAndBalanceSummary.advanceBalance) AS advanceBalance,
-	janAmount.janAmount1 as janAmount,
-	febAmount.febAmount1 as febAmount,
-	marAmount.marAmount1 as marAmount,
-	aprAmount.aprAmount1 as aprAmount,
-	mayAmount.mayAmount1 as mayAmount,
-	junAmount.junAmount1 as junAmount,
-	julAmount.julAmount1 as julAmount,
-	augAmount.augAmount1 as augAmount,
-	septAmount.septAmount1 as septAmount,
-	octAmount.octAmount1 as octAmount,
-	novAmount.novAmount1 as novAmount,
-	decAmount.decAmount1 as decAmount
-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(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	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
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	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
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 3   
-		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-		GROUP BY AdvancePaymentAndBalanceSummary1.project
-	) AS marAmount ON marAmount.project1 = AdvancePaymentAndBalanceSummary.project
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	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
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 5   
-		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-		GROUP BY AdvancePaymentAndBalanceSummary1.project
-	) AS mayAmount ON mayAmount.project1 = AdvancePaymentAndBalanceSummary.project
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 6   
-		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-		GROUP BY AdvancePaymentAndBalanceSummary1.project
-	) AS junAmount ON junAmount.project1 = AdvancePaymentAndBalanceSummary.project
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	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
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	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
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	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
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	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
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 11   
-		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-		GROUP BY AdvancePaymentAndBalanceSummary1.project
-	) AS novAmount ON novAmount.project1 = AdvancePaymentAndBalanceSummary.project
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount1 ,
-		AdvancePaymentAndBalanceSummary1.project  AS project1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 12   
-		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-		GROUP BY AdvancePaymentAndBalanceSummary1.project
-	) AS decAmount ON decAmount.project1 = AdvancePaymentAndBalanceSummary.project
-	WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year 
-	AND AdvancePaymentAndBalanceSummary.regionalCompany = :?regionalCompanyName
-	GROUP BY AdvancePaymentAndBalanceSummary.project
-UNION ALL
-	SELECT
-	'合计' AS purchaseSandUnit,
-	'-' AS project,
-	SUM(AdvancePaymentAndBalanceSummary.lastYearAdvance) AS lastYearAdvance,
-	SUM(AdvancePaymentAndBalanceSummary.paymentSales) AS paymentSales,
-	SUM(AdvancePaymentAndBalanceSummary.totalAdvancePayment) AS totalAdvancePayment,
-	SUM(AdvancePaymentAndBalanceSummary.advancePaymentRefundAmount + AdvancePaymentAndBalanceSummary.marginRefund) AS refundAmount,
-	SUM(AdvancePaymentAndBalanceSummary.advanceBalance) AS advanceBalance,
-	janAmount.janAmount1 as janAmount,
-	febAmount.febAmount1 as febAmount,
-	marAmount.marAmount1 as marAmount,
-	aprAmount.aprAmount1 as aprAmount,
-	mayAmount.mayAmount1 as mayAmount,
-	junAmount.junAmount1 as junAmount,
-	julAmount.julAmount1 as julAmount,
-	augAmount.augAmount1 as augAmount,
-	septAmount.septAmount1 as septAmount,
-	octAmount.octAmount1 as octAmount,
-	novAmount.novAmount1 as novAmount,
-	decAmount.decAmount1 as decAmount		
-FROM
-	AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 1   
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-	) AS janAmount ON janAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 2   
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-	) AS febAmount ON febAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 3   
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-	) AS marAmount ON marAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 4   
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-	) AS aprAmount ON aprAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 5   
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-	) AS mayAmount ON mayAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 6   
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-	) AS junAmount ON junAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 7   
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-	) AS julAmount ON julAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 8   
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-	) AS augAmount ON augAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 9   
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-	) AS septAmount ON septAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 10   
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-	) AS octAmount ON octAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	FROM
-		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
-	WHERE
-		AdvancePaymentAndBalanceSummary1.dealMonth = 11   
-		AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
-	) AS novAmount ON novAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
-	LEFT JOIN(
-	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount1 ,
-        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
-	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
+						 SELECT
+					PurchaseSandCompany.NAME AS purchaseSandUnit,
+					ProjectFiled.projectName AS project,
+					SUM(AdvancePaymentAndBalanceSummary.lastYearAdvance) AS lastYearAdvance,
+					SUM(AdvancePaymentAndBalanceSummary.paymentSales) AS paymentSales,
+					SUM(AdvancePaymentAndBalanceSummary.totalAdvancePayment) AS totalAdvancePayment,
+					SUM(AdvancePaymentAndBalanceSummary.advancePaymentRefundAmount + AdvancePaymentAndBalanceSummary.marginRefund) AS refundAmount,
+					SUM(AdvancePaymentAndBalanceSummary.advanceBalance) AS advanceBalance,
+					janAmount.janAmount1 as janAmount,
+					febAmount.febAmount1 as febAmount,
+					marAmount.marAmount1 as marAmount,
+					aprAmount.aprAmount1 as aprAmount,
+					mayAmount.mayAmount1 as mayAmount,
+					junAmount.junAmount1 as junAmount,
+					julAmount.julAmount1 as julAmount,
+					augAmount.augAmount1 as augAmount,
+					septAmount.septAmount1 as septAmount,
+					octAmount.octAmount1 as octAmount,
+					novAmount.novAmount1 as novAmount,
+					decAmount.decAmount1 as decAmount
+				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(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					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
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					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
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 3   
+						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+						GROUP BY AdvancePaymentAndBalanceSummary1.project
+					) AS marAmount ON marAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					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
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 5   
+						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+						GROUP BY AdvancePaymentAndBalanceSummary1.project
+					) AS mayAmount ON mayAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 6   
+						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+						GROUP BY AdvancePaymentAndBalanceSummary1.project
+					) AS junAmount ON junAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					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
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					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
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					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
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					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
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 11   
+						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+						GROUP BY AdvancePaymentAndBalanceSummary1.project
+					) AS novAmount ON novAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount1 ,
+						AdvancePaymentAndBalanceSummary1.project  AS project1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 12   
+						AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+						GROUP BY AdvancePaymentAndBalanceSummary1.project
+					) AS decAmount ON decAmount.project1 = AdvancePaymentAndBalanceSummary.project
+					WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year 
+					AND AdvancePaymentAndBalanceSummary.regionalCompany = :?regionalCompanyName
+					GROUP BY AdvancePaymentAndBalanceSummary.project
+				UNION ALL
+					SELECT
+					'合计' AS purchaseSandUnit,
+					'-' AS project,
+					SUM(AdvancePaymentAndBalanceSummary.lastYearAdvance) AS lastYearAdvance,
+					SUM(AdvancePaymentAndBalanceSummary.paymentSales) AS paymentSales,
+					SUM(AdvancePaymentAndBalanceSummary.totalAdvancePayment) AS totalAdvancePayment,
+					SUM(AdvancePaymentAndBalanceSummary.advancePaymentRefundAmount + AdvancePaymentAndBalanceSummary.marginRefund) AS refundAmount,
+					SUM(AdvancePaymentAndBalanceSummary.advanceBalance) AS advanceBalance,
+					janAmount.janAmount1 as janAmount,
+					febAmount.febAmount1 as febAmount,
+					marAmount.marAmount1 as marAmount,
+					aprAmount.aprAmount1 as aprAmount,
+					mayAmount.mayAmount1 as mayAmount,
+					junAmount.junAmount1 as junAmount,
+					julAmount.julAmount1 as julAmount,
+					augAmount.augAmount1 as augAmount,
+					septAmount.septAmount1 as septAmount,
+					octAmount.octAmount1 as octAmount,
+					novAmount.novAmount1 as novAmount,
+					decAmount.decAmount1 as decAmount		
+				FROM
+					AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 1   
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+					) AS janAmount ON janAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 2   
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+					) AS febAmount ON febAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 3   
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+					) AS marAmount ON marAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 4   
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+					) AS aprAmount ON aprAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 5   
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+					) AS mayAmount ON mayAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 6   
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+					) AS junAmount ON junAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 7   
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+					) AS julAmount ON julAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 8   
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+					) AS augAmount ON augAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 9   
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+					) AS septAmount ON septAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 10   
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+					) AS octAmount ON octAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					FROM
+						AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
+					WHERE
+						AdvancePaymentAndBalanceSummary1.dealMonth = 11   
+						AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName 
+					) AS novAmount ON novAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
+					LEFT JOIN(
+					SELECT
+						SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount1 ,
+				        AdvancePaymentAndBalanceSummary1.dealYear  AS dealYear1
+					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 
 				</sql>
 		</template>
 	</content>

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

@@ -54,7 +54,7 @@
 			WHERE
 				( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime <= :?endDate ) 
 				AND station.id IN (  :?stationList  ) 
-			ORDER BY
+			ORDER BY :?totalGroupBy , :?subtotalGroupBy ,
 				stationName
 				</sql>
 		</template>

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

@@ -11,51 +11,51 @@
 		<template>
 			<sql-type>SQL</sql-type>
 			<sql>
-		SELECT
-	station.stationName AS stationName,
-	dinasType.dinasTypeName AS dinasTypeName,
-	( SUM( salesSummary.saleDealAmount )  / 1000 ) AS saleDealAmount,
-	( SUM( salesSummary.saleAmount ) / 1000  ) AS saleAmount 
-FROM
-	SalesSummary AS salesSummary
-	LEFT JOIN Station AS station ON station.id = salesSummary.station
-	LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
-WHERE
-	( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
-	AND station.id IN (  :?stationList  ) 
-GROUP BY
-	salesSummary.station,
-	salesSummary.dinasType 
-UNION ALL
-SELECT
-	station.stationName AS stationName,
-	'小计' AS dinasTypeName,
-	( SUM( salesSummary.saleDealAmount ) / 1000 ) AS saleDealAmount,
-	( SUM( salesSummary.saleAmount ) / 1000  ) AS saleAmount 
-FROM
-	SalesSummary AS salesSummary
-	LEFT JOIN Station AS station ON station.id = salesSummary.station
-	LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
-WHERE
-	( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
-	AND station.id IN (  :?stationList  ) 
-GROUP BY
-	salesSummary.station 
-UNION ALL
-SELECT
-	'总计' AS stationName,
-	'———' AS dinasTypeName,
-	( SUM( salesSummary.saleDealAmount )  / 1000 ) AS saleDealAmount,
-	( SUM( salesSummary.saleAmount )  / 1000 )  AS saleAmount 
-FROM
-	SalesSummary AS salesSummary
-	LEFT JOIN Station AS station ON station.id = salesSummary.station
-	LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
-WHERE
-	( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
-	AND station.id IN (  :?stationList  ) 
-ORDER BY
-	stationName
+					SELECT
+				station.stationName AS stationName,
+				dinasType.dinasTypeName AS dinasTypeName,
+				( SUM( salesSummary.saleDealAmount )  / 1000 ) AS saleDealAmount,
+				( SUM( salesSummary.saleAmount ) / 1000  ) AS saleAmount 
+			FROM
+				SalesSummary AS salesSummary
+				LEFT JOIN Station AS station ON station.id = salesSummary.station
+				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
+			WHERE
+				( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
+				AND station.id IN (  :?stationList  ) 
+			GROUP BY
+				salesSummary.station,
+				salesSummary.dinasType 
+			UNION ALL
+			SELECT
+				station.stationName AS stationName,
+				'小计' AS dinasTypeName,
+				( SUM( salesSummary.saleDealAmount ) / 1000 ) AS saleDealAmount,
+				( SUM( salesSummary.saleAmount ) / 1000  ) AS saleAmount 
+			FROM
+				SalesSummary AS salesSummary
+				LEFT JOIN Station AS station ON station.id = salesSummary.station
+				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
+			WHERE
+				( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
+				AND station.id IN (  :?stationList  ) 
+			GROUP BY
+				salesSummary.station 
+			UNION ALL
+			SELECT
+				'总计' AS stationName,
+				'———' AS dinasTypeName,
+				( SUM( salesSummary.saleDealAmount )  / 1000 ) AS saleDealAmount,
+				( SUM( salesSummary.saleAmount )  / 1000 )  AS saleAmount 
+			FROM
+				SalesSummary AS salesSummary
+				LEFT JOIN Station AS station ON station.id = salesSummary.station
+				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
+			WHERE
+				( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
+				AND station.id IN (  :?stationList  ) 
+			ORDER BY  :?totalGroupBy , :?subtotalGroupBy ,
+				stationName
 				</sql>
 		</template>
 	</content>

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

@@ -10,83 +10,89 @@
 	<content>
 		<template>
 			<sql-type>SQL</sql-type>
-			<sql>
-		 SELECT
-	        artificialRecharge.id as id,
-	       artificialRecharge.createTime AS createTime,
-	        purchaseSandCompanyon.name AS purchaseSandUnit,
-	        projectFiled.projectName AS project,
-	    CASE
-	    WHEN artificialRecharge.fundType ='DEPOSIT'  then '保证金充值'
-	    ELSE '预付款充值'
-	    END
-	       as  fundType,
-	       artificialRecharge.rechargeAmount AS rechargeAmount,
-	       '-' AS actualRefundAmount,
-	       artificialRecharge.remark AS remark 
-	    FROM
-	     ArtificialRecharge as artificialRecharge
-	     LEFT JOIN PurchaseSandCompany as purchaseSandCompanyon on purchaseSandCompanyon.id = artificialRecharge.purchaseSandUnit
-	     LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = artificialRecharge.project
-	     WHERE artificialRecharge.regionalCompany = :?regionalCompanyId
-	     AND (artificialRecharge.createTime &gt;= :?startDate AND  artificialRecharge.createTime &lt;= :?endDate)
-	     AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
-	     AND projectFiled.projectName LIKE :?projectName
-	     AND artificialRecharge.fundType = :?fundType
-	     UNION ALL
-	   SELECT
-	      expenseAdjust.id as id,
-		  expenseAdjust.createTime AS createTime,
-		  purchaseSandCompanyon.name AS purchaseSandUnit,
-	      projectFiled.projectName AS project,	    
-	    CASE
-	    WHEN expenseAdjust.fundType ='DEPOSIT'  then '保证金费用调整'
-	    ELSE '预付款费用调整'
-	    END
-	       as fundType,
-	    CASE	
-		WHEN expenseAdjust.expenseAdjustAmount &gt;= '0' THEN
-		  expenseAdjust.expenseAdjustAmount ELSE '-' 
-	    END AS expenseAdjustAmount,
-	    CASE	
-	    WHEN expenseAdjust.expenseAdjustAmount &lt; '0' 
-	    THEN (- expenseAdjust.expenseAdjustAmount) ELSE '-' 
-		END AS actualRefundAmount,
-		   expenseAdjust.remark AS remark 
-		FROM
-			ExpenseAdjust  as expenseAdjust
-			LEFT JOIN PurchaseSandCompany as purchaseSandCompanyon on purchaseSandCompanyon.id = expenseAdjust.purchaseSandUnit
-		    LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = expenseAdjust.project
-		    WHERE expenseAdjust.regionalCompany = :?regionalCompanyId
-	        AND (expenseAdjust.createTime &gt;= :?startDate AND  expenseAdjust.createTime &lt;= :?endDate)
-	        AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
-	        AND projectFiled.projectName LIKE :?projectName
-	        AND expenseAdjust.fundType = :?fundType
-		 UNION ALL
-		SELECT
-		    financeRefund.id as id,
-			financeRefund.createTime AS createTime,
-			purchaseSandCompanyon.name AS purchaseSandUnit,
-	        projectFiled.projectName AS project,	        
-		CASE
-	    WHEN financeRefund.fundType ='1'  THEN '保证金退费'
-	    ELSE '预付款退费'
-	    END
-	      as fundType,
-			'-' AS rechargeAmount,
-			financeRefund.actualRefundAmount AS actualRefundAmount,
-			financeRefund.refundExplain AS remark 
-		FROM
-		  FinanceRefund as financeRefund
-		  LEFT JOIN PurchaseSandCompany as purchaseSandCompanyon on purchaseSandCompanyon.id = financeRefund.purchaseSandCompany
-		  LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = financeRefund.project
-		  WHERE financeRefund.regionalCompany = :?regionalCompanyId
-	      AND (financeRefund.createTime &gt;= :?startDate AND  financeRefund.createTime &lt;= :?endDate)
-	      AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
-	      AND projectFiled.projectName LIKE :?projectName
-	      AND  ( case when 'DEPOSIT' =  :?fundType then '1' else '0' end ) = financeRefund.fundType
-	      ORDER BY createTime DESC
-				</sql>
+			<sql>		
+	    	SELECT
+				financeRefund.id AS id,
+				financeRefund.createTime AS createTime,
+				purchaseSandCompanyon.NAME AS purchaseSandUnit,
+				projectFiled.projectName AS project,
+			CASE
+					
+					WHEN financeRefund.fundType = 1 THEN
+					'保证金退费' ELSE '预付款退费' 
+				END AS fundType,
+				'-' AS rechargeAmount,
+				financeRefund.actualRefundAmount AS actualRefundAmount,
+				financeRefund.refundExplain AS remark 
+			FROM
+				FinanceRefund AS financeRefund
+				LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = financeRefund.purchaseSandCompany
+				LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = financeRefund.project 
+				WHERE
+				financeRefund.regionalCompany = :?regionalCompanyId 
+				AND ( financeRefund.createTime &gt;= :?startDate AND financeRefund.createTime &lt;= :?endDate ) 
+				AND purchaseSandCompanyon.NAME LIKE :?purchaseSandCompanyonName 
+				AND projectFiled.projectName LIKE :?projectName 
+				AND ( CASE WHEN 'DEPOSIT' = :?fundType THEN '1' ELSE '0' END ) = financeRefund.fundType 
+			UNION ALL
+		    SELECT
+				artificialRecharge.id AS id,
+				artificialRecharge.createTime AS createTime,
+				purchaseSandCompanyon.NAME AS purchaseSandUnit,
+				projectFiled.projectName AS project,
+			CASE
+					
+					WHEN artificialRecharge.fundType = 'DEPOSIT' THEN
+					'保证金充值' ELSE '预付款充值' 
+				END AS fundType,
+				artificialRecharge.rechargeAmount AS rechargeAmount,
+				'-' AS actualRefundAmount,
+				artificialRecharge.remark AS remark 
+			FROM
+				ArtificialRecharge AS artificialRecharge
+				LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = artificialRecharge.purchaseSandUnit
+				LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = artificialRecharge.project
+				WHERE
+				artificialRecharge.regionalCompany = :?regionalCompanyId 
+				AND ( artificialRecharge.createTime &gt;= :?startDate AND artificialRecharge.createTime &lt;= :?endDate ) 
+				AND purchaseSandCompanyon.NAME LIKE :?purchaseSandCompanyonName 
+				AND projectFiled.projectName LIKE :?projectName 
+				AND artificialRecharge.fundType = :?fundType 	 
+				UNION ALL
+			SELECT
+				expenseAdjust.id AS id,
+				expenseAdjust.createTime AS createTime,
+				purchaseSandCompanyon.NAME AS purchaseSandUnit,
+				projectFiled.projectName AS project,
+			CASE
+					
+					WHEN expenseAdjust.fundType = 'DEPOSIT' THEN
+					'保证金费用调整' ELSE '预付款费用调整' 
+				END AS fundType,
+			CASE
+					
+					WHEN expenseAdjust.expenseAdjustAmount &gt;= '0' THEN
+				expenseAdjust.expenseAdjustAmount ELSE '-' 
+			END AS rechargeAmount,
+			CASE
+					
+					WHEN expenseAdjust.expenseAdjustAmount &lt;
+				'0' THEN
+					( - expenseAdjust.expenseAdjustAmount ) ELSE '-' 
+					END AS actualRefundAmount,
+				expenseAdjust.remark AS remark 
+				FROM
+					ExpenseAdjust AS expenseAdjust
+					LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = expenseAdjust.purchaseSandUnit
+					LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = expenseAdjust.project 
+				WHERE
+					expenseAdjust.regionalCompany = :?regionalCompanyId 
+					AND ( expenseAdjust.createTime &gt;= :?startDate AND expenseAdjust.createTime &lt;= :?endDate ) 
+				AND purchaseSandCompanyon.NAME LIKE :?purchaseSandCompanyonName 
+				AND projectFiled.projectName LIKE :?projectName 
+				AND expenseAdjust.fundType = :?fundType 
+				ORDER BY createTime DESC
+		    </sql>
 		</template>
 	</content>
 </metadata>

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

@@ -11,469 +11,469 @@
 		<template>
 			<sql-type>SQL</sql-type>
 			<sql>
-		SELECT
-	'总计' as station,
-	'-' 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,
-	aprAmount.aprAmount1 as aprAmount,
-	mayAmount.mayAmount1 as mayAmount,
-	junAmount.junAmount1 as junAmount,
-	julAmount.julAmount1 as julAmount,
-	augAmount.augAmount1 as augAmount,
-	septAmount.septAmount1 as septAmount,
-	octAmount.octAmount1 as octAmount,
-	novAmount.novAmount1 as novAmount,
-	decAmount.decAmount1 as decAmount
-FROM
-	SalesSummary as salesSummary
-	LEFT JOIN Station station ON station.id = salesSummary.station
-	LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType 
-	LEFT JOIN (
-	SELECT
-	    salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS janAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 1 
-	) AS janAmount ON  janAmount.dealYear1 = salesSummary.dealYear
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS febAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 2 
-	) AS febAmount ON  febAmount.dealYear1 = salesSummary.dealYear
-LEFT JOIN (
-	SELECT
-	   salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS marAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 3 
-	) AS marAmount ON  marAmount.dealYear1 = salesSummary.dealYear
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS aprAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 4 
-	) AS aprAmount ON  aprAmount.dealYear1 = salesSummary.dealYear
-LEFT JOIN (
-	SELECT
-	   salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS mayAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 5 
-	) AS mayAmount ON  mayAmount.dealYear1 = salesSummary.dealYear	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS junAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 6 
-	) AS junAmount ON  junAmount.dealYear1 = salesSummary.dealYear	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS julAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 7 
-	) AS julAmount ON  julAmount.dealYear1 = salesSummary.dealYear
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS augAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 8 
-	) AS augAmount ON  augAmount.dealYear1 = salesSummary.dealYear	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS septAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 9 
-	) AS septAmount ON  septAmount.dealYear1 = salesSummary.dealYear
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS octAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 10 
-	) AS octAmount ON  octAmount.dealYear1 = salesSummary.dealYear
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS novAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 11 
-	) AS novAmount ON  novAmount.dealYear1 = salesSummary.dealYear
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dealYear as dealYear1,
-		SUM( salesSummary1.saleAmount ) AS decAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 12 
-	) AS decAmount ON  decAmount.dealYear1 = salesSummary.dealYear
-	where salesSummary.dealYear = :?year
-	AND salesSummary.station IN ( :?stationList )
-	GROUP BY salesSummary.dealYear
-UNION ALL
-SELECT
-	station.stationName as station,
-	'小计' 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,
-	aprAmount.aprAmount1 as aprAmount,
-	mayAmount.mayAmount1 as mayAmount,
-	junAmount.junAmount1 as junAmount,
-	julAmount.julAmount1 as julAmount,
-	augAmount.augAmount1 as augAmount,
-	septAmount.septAmount1 as septAmount,
-	octAmount.octAmount1 as octAmount,
-	novAmount.novAmount1 as novAmount,
-	decAmount.decAmount1 as decAmount
-FROM
-	SalesSummary salesSummary
-	LEFT JOIN Station station ON station.id = salesSummary.station 
-	LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType
-	LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS janAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 1 
-		AND salesSummary1.dealYear = :?year  
-		GROUP BY salesSummary1.station
-	) AS janAmountTab ON  janAmount.station1 = salesSummary.station	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS febAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 2 
-		AND salesSummary1.dealYear = :?year 
-		GROUP BY salesSummary1.station 
-	) AS febAmount ON  febAmount.station1 = salesSummary.station
-LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS marAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 3 
-		AND salesSummary1.dealYear = :?year 
-		GROUP BY salesSummary1.station 
-	) AS marAmount ON  marAmount.station1 = salesSummary.station
-LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS aprAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 4 
-		AND salesSummary1.dealYear = :?year 
-		GROUP BY salesSummary1.station 
-	) AS aprAmount ON  aprAmount.station1 = salesSummary.station
-LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS mayAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 5 
-		AND salesSummary1.dealYear = :?year 
-		GROUP BY salesSummary1.station 
-	) AS mayAmount ON  mayAmount.station1 = salesSummary.station	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS junAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 6 
-		AND salesSummary1.dealYear = :?year 
-		GROUP BY salesSummary1.station 
-	) AS junAmount ON  junAmount.station1 = salesSummary.station 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS julAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 7 
-		AND salesSummary1.dealYear = :?year 
-		GROUP BY salesSummary1.station 
-	) AS julAmount ON  julAmount.station1 = salesSummary.station
-LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS augAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 8 
-		AND salesSummary1.dealYear = :?year 
-		GROUP BY salesSummary1.station 
-	) AS augAmount ON  augAmount.station1 = salesSummary.station 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS septAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 9 
-		AND salesSummary1.dealYear = :?year 
-		GROUP BY salesSummary1.station 
-	) AS septAmount ON  septAmount.station1 = salesSummary.station
-LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS octAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 10 
-		AND salesSummary1.dealYear = :?year 
-		GROUP BY salesSummary1.station 
-	) AS octAmount ON  octAmount.station1 = salesSummary.station	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS novAmount1 
-	FROM
-		SalesSummary salesSummary1 
-		WHERE
-		salesSummary1.dealMonth = 11 
-		AND salesSummary1.dealYear = :?year 
-		GROUP BY salesSummary1.station 
-	) AS novAmount ON  novAmount.station1 = salesSummary.station
-LEFT JOIN (
-	SELECT
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS decAmount1 
-	FROM
-		SalesSummary 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
-UNION ALL
-SELECT
-	station.stationName as station,
-	dinasType.dinasTypeName as dinasType,
-	SUM(salesSummary.saleDealAmount) as saleDealAmount,
-	SUM(salesSummary.saleAmount) as saleAmount,
-	( SUM(salesSummary.saleAmount) / SUM(salesSummary.saleDealAmount) ) as avgAmount,
-	janAmount.janAmount1 as janAmount,
-	febAmount.febAmount1 as febAmount,
-	marAmount.marAmount1 as marAmount,
-	aprAmount.aprAmount1 as aprAmount,
-	mayAmount.mayAmount1 as mayAmount,
-	junAmount.junAmount1 as junAmount,
-	julAmount.julAmount1 as julAmount,
-	augAmount.augAmount1 as augAmount,
-	septAmount.septAmount1 as septAmount,
-	octAmount.octAmount1 as octAmount,
-	novAmount.novAmount1 as novAmount,
-	decAmount.decAmount1 as decAmount
-FROM
-	SalesSummary salesSummary
-	LEFT JOIN Station station ON station.id = salesSummary.station 
-	LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType 
-	LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS janAmount1 
-	FROM
-		SalesSummary 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 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS febAmount1 
-	FROM
-		SalesSummary 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 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS marAmount1 
-	FROM
-		SalesSummary 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 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS aprAmount1 
-	FROM
-		SalesSummary 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 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS mayAmount1 
-	FROM
-		SalesSummary 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 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS junAmount1 
-	FROM
-		SalesSummary 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 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS julAmount1 
-	FROM
-		SalesSummary 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 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS augAmount1 
-	FROM
-		SalesSummary 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 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS septAmount1 
-	FROM
-		SalesSummary 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 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS octAmount1 
-	FROM
-		SalesSummary 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 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS novAmount1 
-	FROM
-		SalesSummary 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 	
-LEFT JOIN (
-	SELECT
-	    salesSummary1.dinasType AS dinasType1,
-	    salesSummary1.station AS station1 , 
-		SUM( salesSummary1.saleAmount ) AS decAmount1 
-	FROM
-		SalesSummary 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
-	station,saleDealAmount DESC
+					SELECT
+				'总计' as station,
+				'-' 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,
+				aprAmount.aprAmount1 as aprAmount,
+				mayAmount.mayAmount1 as mayAmount,
+				junAmount.junAmount1 as junAmount,
+				julAmount.julAmount1 as julAmount,
+				augAmount.augAmount1 as augAmount,
+				septAmount.septAmount1 as septAmount,
+				octAmount.octAmount1 as octAmount,
+				novAmount.novAmount1 as novAmount,
+				decAmount.decAmount1 as decAmount
+			FROM
+				SalesSummary as salesSummary
+				LEFT JOIN Station station ON station.id = salesSummary.station
+				LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType 
+				LEFT JOIN (
+				SELECT
+				    salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS janAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 1 
+				) AS janAmount ON  janAmount.dealYear1 = salesSummary.dealYear
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS febAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 2 
+				) AS febAmount ON  febAmount.dealYear1 = salesSummary.dealYear
+			LEFT JOIN (
+				SELECT
+				   salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS marAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 3 
+				) AS marAmount ON  marAmount.dealYear1 = salesSummary.dealYear
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS aprAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 4 
+				) AS aprAmount ON  aprAmount.dealYear1 = salesSummary.dealYear
+			LEFT JOIN (
+				SELECT
+				   salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS mayAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 5 
+				) AS mayAmount ON  mayAmount.dealYear1 = salesSummary.dealYear	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS junAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 6 
+				) AS junAmount ON  junAmount.dealYear1 = salesSummary.dealYear	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS julAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 7 
+				) AS julAmount ON  julAmount.dealYear1 = salesSummary.dealYear
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS augAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 8 
+				) AS augAmount ON  augAmount.dealYear1 = salesSummary.dealYear	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS septAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 9 
+				) AS septAmount ON  septAmount.dealYear1 = salesSummary.dealYear
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS octAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 10 
+				) AS octAmount ON  octAmount.dealYear1 = salesSummary.dealYear
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS novAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 11 
+				) AS novAmount ON  novAmount.dealYear1 = salesSummary.dealYear
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dealYear as dealYear1,
+					SUM( salesSummary1.saleAmount ) AS decAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 12 
+				) AS decAmount ON  decAmount.dealYear1 = salesSummary.dealYear
+				where salesSummary.dealYear = :?year
+				AND salesSummary.station IN ( :?stationList )
+				GROUP BY salesSummary.dealYear
+			UNION ALL
+			SELECT
+				station.stationName as station,
+				'小计' 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,
+				aprAmount.aprAmount1 as aprAmount,
+				mayAmount.mayAmount1 as mayAmount,
+				junAmount.junAmount1 as junAmount,
+				julAmount.julAmount1 as julAmount,
+				augAmount.augAmount1 as augAmount,
+				septAmount.septAmount1 as septAmount,
+				octAmount.octAmount1 as octAmount,
+				novAmount.novAmount1 as novAmount,
+				decAmount.decAmount1 as decAmount
+			FROM
+				SalesSummary salesSummary
+				LEFT JOIN Station station ON station.id = salesSummary.station 
+				LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType
+				LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS janAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 1 
+					AND salesSummary1.dealYear = :?year  
+					GROUP BY salesSummary1.station
+				) AS janAmountTab ON  janAmount.station1 = salesSummary.station	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS febAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 2 
+					AND salesSummary1.dealYear = :?year 
+					GROUP BY salesSummary1.station 
+				) AS febAmount ON  febAmount.station1 = salesSummary.station
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS marAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 3 
+					AND salesSummary1.dealYear = :?year 
+					GROUP BY salesSummary1.station 
+				) AS marAmount ON  marAmount.station1 = salesSummary.station
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS aprAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 4 
+					AND salesSummary1.dealYear = :?year 
+					GROUP BY salesSummary1.station 
+				) AS aprAmount ON  aprAmount.station1 = salesSummary.station
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS mayAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 5 
+					AND salesSummary1.dealYear = :?year 
+					GROUP BY salesSummary1.station 
+				) AS mayAmount ON  mayAmount.station1 = salesSummary.station	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS junAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 6 
+					AND salesSummary1.dealYear = :?year 
+					GROUP BY salesSummary1.station 
+				) AS junAmount ON  junAmount.station1 = salesSummary.station 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS julAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 7 
+					AND salesSummary1.dealYear = :?year 
+					GROUP BY salesSummary1.station 
+				) AS julAmount ON  julAmount.station1 = salesSummary.station
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS augAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 8 
+					AND salesSummary1.dealYear = :?year 
+					GROUP BY salesSummary1.station 
+				) AS augAmount ON  augAmount.station1 = salesSummary.station 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS septAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 9 
+					AND salesSummary1.dealYear = :?year 
+					GROUP BY salesSummary1.station 
+				) AS septAmount ON  septAmount.station1 = salesSummary.station
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS octAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 10 
+					AND salesSummary1.dealYear = :?year 
+					GROUP BY salesSummary1.station 
+				) AS octAmount ON  octAmount.station1 = salesSummary.station	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS novAmount1 
+				FROM
+					SalesSummary salesSummary1 
+					WHERE
+					salesSummary1.dealMonth = 11 
+					AND salesSummary1.dealYear = :?year 
+					GROUP BY salesSummary1.station 
+				) AS novAmount ON  novAmount.station1 = salesSummary.station
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS decAmount1 
+				FROM
+					SalesSummary 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
+			UNION ALL
+			SELECT
+				station.stationName as station,
+				dinasType.dinasTypeName as dinasType,
+				SUM(salesSummary.saleDealAmount) as saleDealAmount,
+				SUM(salesSummary.saleAmount) as saleAmount,
+				( SUM(salesSummary.saleAmount) / SUM(salesSummary.saleDealAmount) ) as avgAmount,
+				janAmount.janAmount1 as janAmount,
+				febAmount.febAmount1 as febAmount,
+				marAmount.marAmount1 as marAmount,
+				aprAmount.aprAmount1 as aprAmount,
+				mayAmount.mayAmount1 as mayAmount,
+				junAmount.junAmount1 as junAmount,
+				julAmount.julAmount1 as julAmount,
+				augAmount.augAmount1 as augAmount,
+				septAmount.septAmount1 as septAmount,
+				octAmount.octAmount1 as octAmount,
+				novAmount.novAmount1 as novAmount,
+				decAmount.decAmount1 as decAmount
+			FROM
+				SalesSummary salesSummary
+				LEFT JOIN Station station ON station.id = salesSummary.station 
+				LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType 
+				LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS janAmount1 
+				FROM
+					SalesSummary 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 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS febAmount1 
+				FROM
+					SalesSummary 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 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS marAmount1 
+				FROM
+					SalesSummary 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 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS aprAmount1 
+				FROM
+					SalesSummary 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 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS mayAmount1 
+				FROM
+					SalesSummary 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 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS junAmount1 
+				FROM
+					SalesSummary 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 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS julAmount1 
+				FROM
+					SalesSummary 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 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS augAmount1 
+				FROM
+					SalesSummary 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 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS septAmount1 
+				FROM
+					SalesSummary 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 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS octAmount1 
+				FROM
+					SalesSummary 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 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS novAmount1 
+				FROM
+					SalesSummary 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 	
+			LEFT JOIN (
+				SELECT
+				    salesSummary1.dinasType AS dinasType1,
+				    salesSummary1.station AS station1 , 
+					SUM( salesSummary1.saleAmount ) AS decAmount1 
+				FROM
+					SalesSummary 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
 				</sql>
 		</template>
 	</content>