Merge branch 'feature/sales_record_sync' into 'develop'

日报、周报修复

See merge request kunlun/xyst_dinas/xyst_dinas_backend!17

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

@@ -11,7 +11,7 @@
 		<template>
 			<sql-type>SQL</sql-type>
 			<sql>
-		SELECT
+		       SELECT
 				station.stationName AS stationName,
 				dinasType.dinasTypeName AS dinasTypeName,
 				SUM( salesSummary.saleDealAmount ) AS saleDealAmount,
@@ -49,8 +49,8 @@
 				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 
+				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  ) 

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

@@ -49,8 +49,8 @@ SELECT
 	( 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 
+	LEFT JOIN Station AS station ON station.id = salesSummary.station
+	LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
 WHERE
 	( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime < :?endDate ) 
 	AND station.id IN (  :?stationList  )