Commit a4a2d58a by wukaiqiang

日报、周报修复

parent 2324bb10
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<template> <template>
<sql-type>SQL</sql-type> <sql-type>SQL</sql-type>
<sql> <sql>
SELECT SELECT
station.stationName AS stationName, station.stationName AS stationName,
dinasType.dinasTypeName AS dinasTypeName, dinasType.dinasTypeName AS dinasTypeName,
SUM( salesSummary.saleDealAmount ) AS saleDealAmount, SUM( salesSummary.saleDealAmount ) AS saleDealAmount,
...@@ -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 &gt;= :?startDate AND salesSummary.dealTime &lt; :?endDate ) ( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt; :?endDate )
AND station.id IN ( :?stationList ) AND station.id IN ( :?stationList )
......
...@@ -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 &gt;= :?startDate AND salesSummary.dealTime &lt; :?endDate ) ( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt; :?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