Skip to content

C
cloud-fb
Commit 5cead921 by wukaiqiang
Options

经营类报表修改

parent 80a105bf
Showing with 57 additions and 53 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsAdvQuery.jmx
...@@ -12,46 +12,48 @@ ...@@ -12,46 +12,48 @@
<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,
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 )
GROUP BY GROUP BY
SalesSummary.station, salesSummary.station,
SalesSummary.dinasType UNION ALL salesSummary.dinasType
UNION ALL
SELECT SELECT
Station.stationName AS stationName, station.stationName AS stationName,
'小计' AS dinasTypeName, '小计' AS dinasTypeName,
SUM( SalesSummary.saleDealAmount ) AS saleDealAmount, SUM( salesSummary.saleDealAmount ) AS saleDealAmount,
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 )
GROUP BY GROUP BY
SalesSummary.station UNION ALL salesSummary.station
UNION ALL
SELECT SELECT
'总计' AS stationName, '总计' AS stationName,
'———' AS dinasTypeName, '———' AS dinasTypeName,
SUM( SalesSummary.saleDealAmount ) AS saleDealAmount, SUM( salesSummary.saleDealAmount ) AS saleDealAmount,
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 )
ORDER BY ORDER BY
stationName stationName
</sql> </sql>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsAdvQuery.jmx
...@@ -12,48 +12,50 @@ ...@@ -12,48 +12,50 @@
<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, FORMAT( SUM( SalesSummary.saleDealAmount ) / 1000 , 2) AS saleDealAmount,
SUM( SalesSummary.saleAmount ) AS saleAmount FORMAT( SUM( SalesSummary.saleAmount ) / 1000 , 2) 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 )
GROUP BY GROUP BY
SalesSummary.station, salesSummary.station,
SalesSummary.dinasType UNION ALL salesSummary.dinasType
UNION ALL
SELECT SELECT
Station.stationName AS stationName, station.stationName AS stationName,
'小计' AS dinasTypeName, '小计' AS dinasTypeName,
SUM( SalesSummary.saleDealAmount ) AS saleDealAmount, FORMAT( SUM( salesSummary.saleDealAmount ) / 1000 , 2) AS saleDealAmount,
SUM( SalesSummary.saleAmount ) AS saleAmount FORMAT( SUM( salesSummary.saleAmount ) / 1000 , 2) 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 )
GROUP BY GROUP BY
SalesSummary.station UNION ALL salesSummary.station
UNION ALL
SELECT SELECT
'总计' AS stationName, '总计' AS stationName,
'———' AS dinasTypeName, '———' AS dinasTypeName,
SUM( SalesSummary.saleDealAmount ) AS saleDealAmount, FORMAT( SUM( salesSummary.saleDealAmount ) / 1000 , 2) AS saleDealAmount,
SUM( SalesSummary.saleAmount ) AS saleAmount FORMAT( SUM( salesSummary.saleAmount ) / 1000 , 2) 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 )
ORDER BY ORDER BY
stationName stationName
</sql> </sql>
</template> </template>
</content> </content>
......
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