Merge branch 'feature/sales_record_sync' into 'develop'

经营类报表修改 See merge request kunlun/xyst_dinas/xyst_dinas_backend!15

Merge branch 'feature/sales_record_sync' into 'develop'
经营类报表修改 See merge request kunlun/xyst_dinas/xyst_dinas_backend!15
209b13ab · wukaiqiang · dd38c5a1 · 5cead921 · 209b13ab · 209b13ab
Commit 209b13ab authored May 12, 2021 by wukaiqiang
Showing with 57 additions and 53 deletions

OperationsDailyReportsAdvQuery.jmx .../statistics/advanquery/OperationsDailyReportsAdvQuery.jmx +27 -25

OperationsOtherReportsAdvQuery.jmx .../statistics/advanquery/OperationsOtherReportsAdvQuery.jmx +30 -28

No files found.
--- a/backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsAdvQuery.jmx
+++ b/backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsAdvQuery.jmx
@@ -12,46 +12,48 @@
 			<sql-type>SQL</sql-type>
 			<sql>
 		SELECT
-	Station.stationName AS stationName,
-	DinasType.dinasTypeName AS dinasTypeName,
+	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 
+	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  ) 
+	( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt; :?endDate ) 
+	AND station.id IN (  :?stationList  ) 
 GROUP BY
-	SalesSummary.station,
-	SalesSummary.dinasType UNION ALL
+	salesSummary.station,
+	salesSummary.dinasType 
+UNION ALL
 SELECT
-	Station.stationName AS stationName,
+	station.stationName AS stationName,
 	'小计' AS dinasTypeName,
-	SUM( SalesSummary.saleDealAmount ) AS saleDealAmount,
-	SUM( SalesSummary.saleAmount ) AS saleAmount 
+	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 
+	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  ) 
+	( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt; :?endDate ) 
+	AND station.id IN (  :?stationList  ) 
 GROUP BY
-	SalesSummary.station UNION ALL
+	salesSummary.station 
+UNION ALL
 SELECT
 	'总计' AS stationName,
 	'———' AS dinasTypeName,
-	SUM( SalesSummary.saleDealAmount ) AS saleDealAmount,
-	SUM( SalesSummary.saleAmount ) AS saleAmount 
+	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 
+	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  ) 
+	( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt; :?endDate ) 
+	AND station.id IN (  :?stationList  ) 
 ORDER BY
 	stationName
 				</sql>

--- a/backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsAdvQuery.jmx
+++ b/backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsAdvQuery.jmx
@@ -12,48 +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 
+	station.stationName AS stationName,
+	dinasType.dinasTypeName AS dinasTypeName,
+	FORMAT( SUM( SalesSummary.saleDealAmount )  / 1000 , 2) AS saleDealAmount,
+	FORMAT( SUM( SalesSummary.saleAmount ) / 1000 , 2)  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 
+	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  ) 
+	( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt; :?endDate ) 
+	AND station.id IN (  :?stationList  ) 
 GROUP BY
-	SalesSummary.station,
-	SalesSummary.dinasType UNION ALL
+	salesSummary.station,
+	salesSummary.dinasType 
+UNION ALL
 SELECT
-	Station.stationName AS stationName,
+	station.stationName AS stationName,
 	'小计' AS dinasTypeName,
-	SUM( SalesSummary.saleDealAmount ) AS saleDealAmount,
-	SUM( SalesSummary.saleAmount ) AS saleAmount 
+	FORMAT( SUM( salesSummary.saleDealAmount ) / 1000 , 2)  AS saleDealAmount,
+	FORMAT( SUM( salesSummary.saleAmount ) / 1000 , 2)  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 
+	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  ) 
+	( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt; :?endDate ) 
+	AND station.id IN (  :?stationList  ) 
 GROUP BY
-	SalesSummary.station UNION ALL
+	salesSummary.station 
+UNION ALL
 SELECT
 	'总计' AS stationName,
 	'———' AS dinasTypeName,
-	SUM( SalesSummary.saleDealAmount ) AS saleDealAmount,
-	SUM( SalesSummary.saleAmount ) AS saleAmount 
+	FORMAT( SUM( salesSummary.saleDealAmount )  / 1000 , 2) AS saleDealAmount,
+	FORMAT( SUM( salesSummary.saleAmount )  / 1000 , 2)  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 
+	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  ) 
+	( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt; :?endDate ) 
+	AND station.id IN (  :?stationList  ) 
 ORDER BY
-	 stationName
+	stationName
 				</sql>
 		</template>
 	</content>