Merge branch 'feature/sales_record_sync' into 'develop'

统计测试版本-2021-05-12-13:53

See merge request kunlun/xyst_dinas/xyst_dinas_backend!10

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

@@ -293,7 +293,7 @@ FROM
 	AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
 	WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year 
 	AND AdvancePaymentAndBalanceSummary.regionalCompany = :?regionalCompanyName
-ORDER BY	(purchaseSandUnit = '合计') ASC
+ORDER BY purchaseSandUnit = '合计' ASC
 				</sql>
 		</template>
 	</content>

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

@@ -22,7 +22,7 @@ FROM
 	LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType 
 WHERE
 	( SalesSummary.dealTime >= :?startDate AND SalesSummary.dealTime < :?endDate ) 
-	AND Station.id IN :?stationList 
+	AND Station.id IN (  :?stationList  ) 
 GROUP BY
 	SalesSummary.station,
 	SalesSummary.dinasType UNION ALL
@@ -37,7 +37,7 @@ FROM
 	LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType 
 WHERE
 	( SalesSummary.dealTime >= :?startDate AND SalesSummary.dealTime < :?endDate ) 
-	AND Station.id IN :?stationList 
+	AND Station.id IN (  :?stationList  ) 
 GROUP BY
 	SalesSummary.station UNION ALL
 SELECT
@@ -51,12 +51,12 @@ FROM
 	LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType 
 WHERE
 	( SalesSummary.dealTime >= :?startDate AND SalesSummary.dealTime < :?endDate ) 
-	AND Station.id IN :?stationList 
+	AND Station.id IN (  :?stationList  ) 
 ORDER BY
-	( stationName = '总计' ) DESC,
+	 stationName = '总计'  DESC,
 	stationName,
-	( dinasTypeName = '小计' ) ASC
+	 dinasTypeName = '小计'  ASC
 				</sql>
 		</template>
 	</content>
-</metadata>
+</metadata>
\ No newline at end of file

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

@@ -22,7 +22,7 @@ FROM
 	LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType 
 WHERE
 	( SalesSummary.dealTime >= :?startDate AND SalesSummary.dealTime < :?endDate ) 
-	AND Station.id IN :?stationList 
+	AND Station.id IN (  :?stationList  ) 
 GROUP BY
 	SalesSummary.station,
 	SalesSummary.dinasType UNION ALL
@@ -37,7 +37,7 @@ FROM
 	LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType 
 WHERE
 	( SalesSummary.dealTime >= :?startDate AND SalesSummary.dealTime < :?endDate ) 
-	AND Station.id IN :?stationList 
+	AND Station.id IN (  :?stationList  ) 
 GROUP BY
 	SalesSummary.station UNION ALL
 SELECT
@@ -51,12 +51,12 @@ FROM
 	LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType 
 WHERE
 	( SalesSummary.dealTime >= :?startDate AND SalesSummary.dealTime < :?endDate ) 
-	AND Station.id IN :?stationList 
+	AND Station.id IN (  :?stationList  ) 
 ORDER BY
-	( stationName = '总计' ) DESC,
+	 stationName = '总计'  DESC,
 	stationName,
-	( dinasTypeName = '小计' ) ASC
+	 dinasTypeName = '小计'  ASC
 				</sql>
 		</template>
 	</content>
-</metadata>
+</metadata>
\ No newline at end of file