Merge branch 'feature/sales_record_sync' into 'develop'

经营类统计初版

See merge request kunlun/xyst_dinas/xyst_dinas_backend!9

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

@@ -17,13 +17,13 @@
 	SUM(AdvancePaymentAndBalanceSummary.lastYearAdvance) AS lastYearAdvance,
 	SUM(AdvancePaymentAndBalanceSummary.paymentSales) AS paymentSales,
 	SUM(AdvancePaymentAndBalanceSummary.totalAdvancePayment) AS totalAdvancePayment,
-	SUM(AdvancePaymentAndBalanceSummary.advancePaymentRefundAmount + AdvancePaymentAndBalanceSummary.marginRefund),
+	SUM(AdvancePaymentAndBalanceSummary.advancePaymentRefundAmount + AdvancePaymentAndBalanceSummary.marginRefund) AS refundAmount,
 	SUM(AdvancePaymentAndBalanceSummary.advanceBalance) AS advanceBalance,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS janAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '1'   
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -32,9 +32,9 @@
 	) AS janAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS febAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '2' 	  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year  
@@ -43,9 +43,9 @@
 	) AS febAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS marAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '3' 	  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -54,9 +54,9 @@
 	) AS marAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS aprAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '4' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year  
@@ -65,9 +65,9 @@
 	) AS aprAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS mayAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '5' 
      	AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -76,9 +76,9 @@
 	) AS mayAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS junAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '6' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -87,9 +87,9 @@
 	) AS junAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS julAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '7' 	  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -98,9 +98,9 @@
 	) AS julAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS augAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '8' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -109,9 +109,9 @@
 	) AS augAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS septAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '9' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -120,9 +120,9 @@
 	) AS septAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS octAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '10' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year  
@@ -131,9 +131,9 @@
 	) AS octAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS novAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '11' 
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year  
@@ -142,9 +142,9 @@
 	) AS novAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS decAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '12' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year  
@@ -153,7 +153,7 @@
 	) AS decAmount
 	
 FROM
-	xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary
+	AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
 	LEFT JOIN PurchaseSandCompany AS PurchaseSandCompany ON PurchaseSandCompany.ID =  AdvancePaymentAndBalanceSummary.purchaseSandUnit
 	LEFT JOIN ProjectFiled AS ProjectFiled ON ProjectFiled.ID = AdvancePaymentAndBalanceSummary.project
 	WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year 
@@ -166,13 +166,13 @@ UNION ALL
 	SUM(AdvancePaymentAndBalanceSummary.lastYearAdvance) AS lastYearAdvance,
 	SUM(AdvancePaymentAndBalanceSummary.paymentSales) AS paymentSales,
 	SUM(AdvancePaymentAndBalanceSummary.totalAdvancePayment) AS totalAdvancePayment,
-	SUM(AdvancePaymentAndBalanceSummary.advancePaymentRefundAmount + AdvancePaymentAndBalanceSummary.marginRefund),
+	SUM(AdvancePaymentAndBalanceSummary.advancePaymentRefundAmount + AdvancePaymentAndBalanceSummary.marginRefund) AS refundAmount,
 	SUM(AdvancePaymentAndBalanceSummary.advanceBalance) AS advanceBalance,
 		(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS janAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '1'   
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -180,9 +180,9 @@ UNION ALL
 	) AS janAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS febAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '2' 	  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -190,9 +190,9 @@ UNION ALL
 	) AS febAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS marAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '3' 	  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -200,9 +200,9 @@ UNION ALL
 	) AS marAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS aprAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '4' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -210,9 +210,9 @@ UNION ALL
 	) AS aprAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS mayAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '5' 
      	AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -220,9 +220,9 @@ UNION ALL
 	) AS mayAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS junAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '6' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -230,9 +230,9 @@ UNION ALL
 	) AS junAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS julAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '7' 	  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -240,9 +240,9 @@ UNION ALL
 	) AS julAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS augAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '8' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year  
@@ -250,9 +250,9 @@ UNION ALL
 	) AS augAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS septAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '9' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -260,9 +260,9 @@ UNION ALL
 	) AS septAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS octAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '10' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year 
@@ -270,9 +270,9 @@ UNION ALL
 	) AS octAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS novAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '11' 
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year  
@@ -280,9 +280,9 @@ UNION ALL
 	) AS novAmount,
 	(
 	SELECT
-		SUM( AdvancePaymentAndBalanceSummary1.payment_sales ) AS decAmount 
+		SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount 
 	FROM
-		xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary1 
+		AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1 
 	WHERE
 		AdvancePaymentAndBalanceSummary1.dealMonth = '12' 		  
 		AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
@@ -290,7 +290,7 @@ UNION ALL
 	) AS decAmount
 		
 FROM
-	xyst_dinas_statistics_advancepayment_Balance_summary AS AdvancePaymentAndBalanceSummary
+	AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
 	WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year 
 	AND AdvancePaymentAndBalanceSummary.regionalCompany = :?regionalCompanyName
 ORDER BY	(purchaseSandUnit = '合计') ASC

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

@@ -3,8 +3,8 @@
 	<specification>1.0</specification>
 	<id>21639dfb-910e-4054-826a-e6f051faf965</id>
 	<name>com.xyst.dinas.statistics.advanquery.OperationsDailyReportsAdvQuery</name>
-	<title>回款明细</title>
-	<description>回款明细</description>
+	<title>经营日报</title>
+	<description>经营日报</description>
 	<define>advanced.query.template</define>
 	<define-version>1.0</define-version>
 	<content>
@@ -12,77 +12,50 @@
 			<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
-	     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
-		 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
-	      ORDER BY createTime DESC
+	Station.stationName AS stationName,
+	DinasType.dinasTypeName AS dinasTypeName,
+	SUM( SalesSummary.saleDealAmount ) AS saleDealAmount,
+	SUM( SalesSummary.saleAmount ) 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 ) AS saleDealAmount,
+	SUM( SalesSummary.saleAmount ) 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 ) AS saleDealAmount,
+	SUM( SalesSummary.saleAmount ) 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 = '总计' ) DESC,
+	stationName,
+	( dinasTypeName = '小计' ) ASC
 				</sql>
 		</template>
 	</content>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
+	<specification>1.0</specification>
+	<id>1c58a0d5-aae3-4dbd-a87a-9acb8d503f30</id>
+	<name>com.xyst.dinas.statistics.advanquery.OperationsOtherReportsAdvQuery</name>
+	<title>经营周报/月报/季报/年报</title>
+	<description>经营周报/月报/季报/年报</description>
+	<define>advanced.query.template</define>
+	<define-version>1.0</define-version>
+	<content>
+		<template>
+			<sql-type>SQL</sql-type>
+			<sql>
+		SELECT
+	Station.stationName AS stationName,
+	DinasType.dinasTypeName AS dinasTypeName,
+	SUM( SalesSummary.saleDealAmount ) AS saleDealAmount,
+	SUM( SalesSummary.saleAmount ) 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 ) AS saleDealAmount,
+	SUM( SalesSummary.saleAmount ) 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 ) AS saleDealAmount,
+	SUM( SalesSummary.saleAmount ) 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 = '总计' ) DESC,
+	stationName,
+	( dinasTypeName = '小计' ) ASC
+				</sql>
+		</template>
+	</content>
+</metadata>

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

@@ -14,8 +14,8 @@
 		SELECT
 	'总计' as station,
 	'' as dinasType,
-	SUM(salesSummary.saleDealAmount) as saleDealAmount,
-	SUM(salesSummary.saleAmount) as saleAmount,
+	SUM( salesSummary.saleDealAmount ) as saleDealAmount,
+	SUM( salesSummary.saleAmount ) as saleAmount,
 	''  as avgAmount,
 	(
 	SELECT
@@ -24,7 +24,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '1' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.dealYear = :?year 
 	) AS janAmount,
 	(
@@ -34,7 +34,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '2' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.dealYear = :?year 
 	) AS febAmount,
 	(
@@ -44,7 +44,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '3' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.dealYear = :?year 
 	) AS marAmount,
 	(
@@ -54,7 +54,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '4' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.dealYear = :?year 
 	) AS aprAmount,
 	(
@@ -64,7 +64,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '5'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.dealYear = :?year 
 	) AS mayAmount,
 	(
@@ -74,7 +74,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '6'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.dealYear = :?year 
 	) AS junAmount,
 	(
@@ -84,7 +84,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '7'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.dealYear = :?year 
 	) AS julAmount,
 	(
@@ -94,7 +94,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '8'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.dealYear = :?year 
 	) AS augAmount,
 	(
@@ -104,7 +104,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '9'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.dealYear = :?year 
 	) AS septAmount,
 	(
@@ -114,7 +114,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '10'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.dealYear = :?year 
 	) AS octAmount,
 	(
@@ -124,7 +124,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '11'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.dealYear = :?year 
 	) AS novAmount,
 	(
@@ -134,7 +134,7 @@
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '12'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.dealYear = :?year 
 	) AS decAmount
 FROM
@@ -142,11 +142,11 @@ FROM
 	LEFT JOIN Station station ON station.id = salesSummary.station
 	LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType 
 	where salesSummary.deal_year = :?year
-	AND salesSummary.station IN :?stationList
+	 
 	GROUP BY salesSummary.deal_year
 UNION ALL
 SELECT
-	station.station_name as station,
+	station.stationName as station,
 	'小计' as dinasType,
 	SUM(salesSummary.saleDealAmount) as saleDealAmount,
 	SUM(salesSummary.saleAmount) as saleAmount,
@@ -158,7 +158,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '1' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS janAmount,
@@ -169,7 +169,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '2'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS febAmount,
@@ -180,7 +180,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '3' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS marAmount,
@@ -191,7 +191,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '4' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS aprAmount,
@@ -202,7 +202,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '5'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS mayAmount,
@@ -213,7 +213,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '6' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS junAmount,
@@ -224,7 +224,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '7'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS julAmount,
@@ -235,7 +235,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '8'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS augAmount,
@@ -246,7 +246,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '9' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS septAmount,
@@ -257,7 +257,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '10'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS octAmount,
@@ -268,7 +268,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '11'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS novAmount,
@@ -279,7 +279,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '12'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dealYear = :?year 
 	) AS decAmount 
@@ -288,15 +288,15 @@ FROM
 	LEFT JOIN Station station ON station.id = salesSummary.station 
 	LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType 
 	where salesSummary.deal_year = :?year
-    AND salesSummary.station IN :?stationList
+     
 	GROUP BY station
 UNION ALL
 SELECT
-	station.station_name as station,
-	dinasType.dinas_type_name as dinasType,
+	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,
+	SUM(salesSummary.saleAmount) / SUM(salesSummary.saleDealAmount) as avgAmount,
 	(
 	SELECT
 		SUM( SalesSummary1.saleAmount ) AS janAmount 
@@ -304,7 +304,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '1' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -316,7 +316,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '2' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -328,7 +328,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '3' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -340,7 +340,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '4' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -352,7 +352,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '5' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -364,7 +364,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '6'
-		AND salesSummary1.station IN :?stationList 
+		  
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -376,7 +376,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '7' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -388,7 +388,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '8' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -400,7 +400,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '9' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -412,7 +412,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '10' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -424,7 +424,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '11' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -436,7 +436,7 @@ SELECT
 		SalesSummary SalesSummary1 
 	WHERE
 		SalesSummary1.dealMonth = '12' 
-		AND salesSummary1.station IN :?stationList
+		 
 		AND SalesSummary1.station = SalesSummary.station 
 		AND SalesSummary1.dinasType = SalesSummary.dinasType 
 		AND SalesSummary1.dealYear = :?year 
@@ -446,10 +446,10 @@ FROM
 	LEFT JOIN Station station ON station.id = salesSummary.station 
 	LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType 
 	WHERE salesSummary.deal_year = :?year
-	AND salesSummary.station IN :?stationList
+	 
 	GROUP BY station,dinasType
-  ORDER BY  (station = '总计') DESC,
-	station,saleDealAmount DESC
+  
+	
 				</sql>
 		</template>
 	</content>