Merge branch 'feature/sales_record_sync' into 'develop'

经营类报表修复

See merge request kunlun/xyst_dinas/xyst_dinas_backend!16

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

@@ -12,50 +12,50 @@
 			<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
+				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
 				</sql>
 		</template>
 	</content>

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

@@ -14,8 +14,8 @@
 		SELECT
 	station.stationName AS stationName,
 	dinasType.dinasTypeName AS dinasTypeName,
-	FORMAT( SUM( SalesSummary.saleDealAmount )  / 1000 , 2) AS saleDealAmount,
-	FORMAT( SUM( SalesSummary.saleAmount ) / 1000 , 2)  AS saleAmount 
+	( 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
@@ -30,8 +30,8 @@ UNION ALL
 SELECT
 	station.stationName AS stationName,
 	'小计' AS dinasTypeName,
-	FORMAT( SUM( salesSummary.saleDealAmount ) / 1000 , 2)  AS saleDealAmount,
-	FORMAT( SUM( salesSummary.saleAmount ) / 1000 , 2)  AS saleAmount 
+	( 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
@@ -45,8 +45,8 @@ UNION ALL
 SELECT
 	'总计' AS stationName,
 	'———' AS dinasTypeName,
-	FORMAT( SUM( salesSummary.saleDealAmount )  / 1000 , 2) AS saleDealAmount,
-	FORMAT( SUM( salesSummary.saleAmount )  / 1000 , 2)  AS saleAmount 
+	( 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

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

@@ -35,7 +35,7 @@ FROM
 	LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType 
 	LEFT JOIN (
 	SELECT
-	    SalesSummary1.dealYear as dealYear1,
+	    salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS janAmount1 
 	FROM
 		SalesSummary salesSummary1 
@@ -44,7 +44,7 @@ FROM
 	) AS janAmount ON  janAmount.dealYear1 = salesSummary.dealYear
 LEFT JOIN (
 	SELECT
-	    SalesSummary1.dealYear as dealYear1,
+	    salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS febAmount1 
 	FROM
 		SalesSummary salesSummary1 
@@ -53,7 +53,7 @@ LEFT JOIN (
 	) AS febAmount ON  febAmount.dealYear1 = salesSummary.dealYear
 LEFT JOIN (
 	SELECT
-	   SalesSummary1.dealYear as dealYear1,
+	   salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS marAmount1 
 	FROM
 		SalesSummary salesSummary1 
@@ -62,7 +62,7 @@ LEFT JOIN (
 	) AS marAmount ON  marAmount.dealYear1 = salesSummary.dealYear
 LEFT JOIN (
 	SELECT
-	    SalesSummary1.dealYear as dealYear1,
+	    salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS aprAmount1 
 	FROM
 		SalesSummary salesSummary1 
@@ -71,7 +71,7 @@ LEFT JOIN (
 	) AS aprAmount ON  aprAmount.dealYear1 = salesSummary.dealYear
 LEFT JOIN (
 	SELECT
-	   SalesSummary1.dealYear as dealYear1,
+	   salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS mayAmount1 
 	FROM
 		SalesSummary salesSummary1 
@@ -80,7 +80,7 @@ LEFT JOIN (
 	) AS mayAmount ON  mayAmount.dealYear1 = salesSummary.dealYear	
 LEFT JOIN (
 	SELECT
-	    SalesSummary1.dealYear as dealYear1,
+	    salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS junAmount1 
 	FROM
 		SalesSummary salesSummary1 
@@ -89,7 +89,7 @@ LEFT JOIN (
 	) AS junAmount ON  junAmount.dealYear1 = salesSummary.dealYear	
 LEFT JOIN (
 	SELECT
-	    SalesSummary1.dealYear as dealYear1,
+	    salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS julAmount1 
 	FROM
 		SalesSummary salesSummary1 
@@ -98,7 +98,7 @@ LEFT JOIN (
 	) AS julAmount ON  julAmount.dealYear1 = salesSummary.dealYear
 LEFT JOIN (
 	SELECT
-	    SalesSummary1.dealYear as dealYear1,
+	    salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS augAmount1 
 	FROM
 		SalesSummary salesSummary1 
@@ -107,7 +107,7 @@ LEFT JOIN (
 	) AS augAmount ON  augAmount.dealYear1 = salesSummary.dealYear	
 LEFT JOIN (
 	SELECT
-	    SalesSummary1.dealYear as dealYear1,
+	    salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS septAmount1 
 	FROM
 		SalesSummary salesSummary1 
@@ -116,7 +116,7 @@ LEFT JOIN (
 	) AS septAmount ON  septAmount.dealYear1 = salesSummary.dealYear
 LEFT JOIN (
 	SELECT
-	    SalesSummary1.dealYear as dealYear1,
+	    salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS octAmount1 
 	FROM
 		SalesSummary salesSummary1 
@@ -125,7 +125,7 @@ LEFT JOIN (
 	) AS octAmount ON  octAmount.dealYear1 = salesSummary.dealYear
 LEFT JOIN (
 	SELECT
-	    SalesSummary1.dealYear as dealYear1,
+	    salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS novAmount1 
 	FROM
 		SalesSummary salesSummary1 
@@ -134,7 +134,7 @@ LEFT JOIN (
 	) AS novAmount ON  novAmount.dealYear1 = salesSummary.dealYear
 LEFT JOIN (
 	SELECT
-	    SalesSummary1.dealYear as dealYear1,
+	    salesSummary1.dealYear as dealYear1,
 		SUM( salesSummary1.saleAmount ) AS decAmount1 
 	FROM
 		SalesSummary salesSummary1