Skip to content

C
cloud-fb
Commit 88ebb063 by wukaiqiang
Options

Merge branch 'feature/sales_record_sync' into 'develop' 

日报、周报修复

See merge request kunlun/xyst_dinas/xyst_dinas_backend!17
parents 2324bb10 a4a2d58a
Showing with 4 additions and 4 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsAdvQuery.jmx
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
SUM( salesSummary.saleAmount ) AS saleAmount SUM( salesSummary.saleAmount ) AS saleAmount
FROM FROM
SalesSummary AS salesSummary SalesSummary AS salesSummary
LEFT JOIN Station AS station ON Station.id = salesSummary.station LEFT JOIN Station AS station ON station.id = salesSummary.station
LEFT JOIN DinasType AS dinasType ON DinasType.id = salesSummary.dinasType LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
WHERE WHERE
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime < :?endDate ) ( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime < :?endDate )
AND station.id IN ( :?stationList ) AND station.id IN ( :?stationList )
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsAdvQuery.jmx
...@@ -49,8 +49,8 @@ SELECT ...@@ -49,8 +49,8 @@ SELECT
( SUM( salesSummary.saleAmount ) / 1000 ) AS saleAmount ( SUM( salesSummary.saleAmount ) / 1000 ) AS saleAmount
FROM FROM
SalesSummary AS salesSummary SalesSummary AS salesSummary
LEFT JOIN Station AS station ON Station.id = salesSummary.station LEFT JOIN Station AS station ON station.id = salesSummary.station
LEFT JOIN DinasType AS dinasType ON DinasType.id = salesSummary.dinasType LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
WHERE WHERE
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime < :?endDate ) ( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime < :?endDate )
AND station.id IN ( :?stationList ) AND station.id IN ( :?stationList )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment