Skip to content

C
cloud-fb
Commit ad554e69 by wukaiqiang
Options

更新经营日报关联条件及销售汇总 无数据源问题

parent 4c18d0cc
Showing with 10 additions and 332 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsAdvQuery.jmx
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
GROUP BY GROUP BY
salesSummary.station salesSummary.station ,
salesSummary.dealTime
UNION ALL UNION ALL
SELECT SELECT
'总计' AS stationName, '总计' AS stationName,
...@@ -61,7 +62,8 @@ ...@@ -61,7 +62,8 @@
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
GROUP BY salesSummary.dealTime
) AS result ) AS result
END END
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesSummaryAdvQuery.jmx
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
<define-version>1.0</define-version> <define-version>1.0</define-version>
<content> <content>
<template> <template>
<sql-type>SQL</sql-type> <sql-type>NPSQL</sql-type>
<sql> <sql>
define query queryCompletionSalesSummary() begin
SELECT SELECT
result.station AS station, result.station AS station,
result.dinasType AS dinasType, result.dinasType AS dinasType,
...@@ -31,332 +32,7 @@ ...@@ -31,332 +32,7 @@
result.decAmount AS decAmount result.decAmount AS decAmount
FROM FROM
( (
SELECT
'总计' as station,
'--' as dinasType,
SUM(salesSummary.saleDealAmount) as saleDealAmount,
SUM(salesSummary.saleAmount) as saleAmount,
'--' as avgAmount,
janAmount.janAmount1 as janAmount,
febAmount.febAmount1 as febAmount,
marAmount.marAmount1 as marAmount,
aprAmount.aprAmount1 as aprAmount,
mayAmount.mayAmount1 as mayAmount,
junAmount.junAmount1 as junAmount,
julAmount.julAmount1 as julAmount,
augAmount.augAmount1 as augAmount,
septAmount.septAmount1 as septAmount,
octAmount.octAmount1 as octAmount,
novAmount.novAmount1 as novAmount,
decAmount.decAmount1 as decAmount,
salesSummary.dealYear AS dealYear
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 (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS janAmount1 ,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 1
GROUP BY salesSummary1.station
) AS janAmount ON janAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS febAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 2
GROUP BY salesSummary1.station
) AS febAmount ON febAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS marAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 3
GROUP BY salesSummary1.station
) AS marAmount ON marAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS aprAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 4
GROUP BY salesSummary1.station
) AS aprAmount ON aprAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS mayAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 5
GROUP BY salesSummary1.station
) AS mayAmount ON mayAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS junAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 6
GROUP BY salesSummary1.station
) AS junAmount ON junAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS julAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 7
GROUP BY salesSummary1.station
) AS julAmount ON julAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS augAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 8
GROUP BY salesSummary1.station
) AS augAmount ON augAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS septAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 9
GROUP BY salesSummary1.station
) AS septAmount ON septAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS octAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 10
GROUP BY salesSummary1.station
) AS octAmount ON octAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS novAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 11
GROUP BY salesSummary1.station
) AS novAmount ON novAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS decAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 12
GROUP BY salesSummary1.station
) AS decAmount ON decAmount.dealYear1 = salesSummary.dealYear
GROUP BY salesSummary.dealYear
UNION ALL
SELECT
station.stationName as station,
'小计' as dinasType,
SUM(salesSummary.saleDealAmount) as saleDealAmount,
SUM(salesSummary.saleAmount) as saleAmount,
'--' as avgAmount,
janAmount.janAmount1 as janAmount,
febAmount.febAmount1 as febAmount,
marAmount.marAmount1 as marAmount,
aprAmount.aprAmount1 as aprAmount,
mayAmount.mayAmount1 as mayAmount,
junAmount.junAmount1 as junAmount,
julAmount.julAmount1 as julAmount,
augAmount.augAmount1 as augAmount,
septAmount.septAmount1 as septAmount,
octAmount.octAmount1 as octAmount,
novAmount.novAmount1 as novAmount,
decAmount.decAmount1 as decAmount,
salesSummary.dealYear AS dealYear
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 (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS janAmount1 ,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 1
GROUP BY salesSummary1.station
) AS janAmount ON janAmount.station1 = salesSummary.station
AND janAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS febAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 2
GROUP BY salesSummary1.station
) AS febAmount ON febAmount.station1 = salesSummary.station
AND febAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS marAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 3
GROUP BY salesSummary1.station
) AS marAmount ON marAmount.station1 = salesSummary.station
AND marAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS aprAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 4
GROUP BY salesSummary1.station
) AS aprAmount ON aprAmount.station1 = salesSummary.station
AND aprAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS mayAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 5
GROUP BY salesSummary1.station
) AS mayAmount ON mayAmount.station1 = salesSummary.station
AND mayAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS junAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 6
GROUP BY salesSummary1.station
) AS junAmount ON junAmount.station1 = salesSummary.station
AND junAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS julAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 7
GROUP BY salesSummary1.station
) AS julAmount ON julAmount.station1 = salesSummary.station
AND julAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS augAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 8
GROUP BY salesSummary1.station
) AS augAmount ON augAmount.station1 = salesSummary.station
AND augAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS septAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 9
GROUP BY salesSummary1.station
) AS septAmount ON septAmount.station1 = salesSummary.station
AND septAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS octAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 10
GROUP BY salesSummary1.station
) AS octAmount ON octAmount.station1 = salesSummary.station
AND octAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS novAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 11
GROUP BY salesSummary1.station
) AS novAmount ON novAmount.station1 = salesSummary.station
AND novAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS decAmount1,
salesSummary1.dealYear AS dealYear1
FROM
SalesSummary AS salesSummary1
WHERE
salesSummary1.dealMonth = 12
GROUP BY salesSummary1.station
) AS decAmount ON decAmount.station1 = salesSummary.station
AND decAmount.dealYear1 = salesSummary.dealYear
GROUP BY salesSummary.station
UNION ALL
SELECT SELECT
station.stationName as station, station.stationName as station,
dinasType.dinasTypeName as dinasType, dinasType.dinasTypeName as dinasType,
...@@ -377,7 +53,7 @@ ...@@ -377,7 +53,7 @@
decAmount.decAmount1 as decAmount, decAmount.decAmount1 as decAmount,
salesSummary.dealYear AS dealYear salesSummary.dealYear AS dealYear
FROM FROM
SalesSummary 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
LEFT JOIN ( LEFT JOIN (
...@@ -536,8 +212,8 @@ ...@@ -536,8 +212,8 @@
GROUP BY salesSummary1.station,salesSummary1.dinasType GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS decAmount ON decAmount.station1 = salesSummary.station AND decAmount.dinasType1 = salesSummary.dinasType ) AS decAmount ON decAmount.station1 = salesSummary.station AND decAmount.dinasType1 = salesSummary.dinasType
AND decAmount.dealYear1 = salesSummary.dealYear AND decAmount.dealYear1 = salesSummary.dealYear
) AS result ) AS result
END
</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