Skip to content

C
cloud-fb
Commit e7a700aa by 焦凯
Options

Merge branch 'feature/sales_record_sync' into 'develop' 

调整统计SQL格式，增加group by条件参数

See merge request kunlun/xyst_dinas/xyst_dinas_backend!21
parents 917b4b22 9f43e7e1
Showing with 132 additions and 115 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/AdvancePaymentBalanceSumAdvQuery.jmx
......@@ -31,10 +31,10 @@
octAmount.octAmount1 as octAmount,
novAmount.novAmount1 as novAmount,
decAmount.decAmount1 as decAmount
FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
LEFT JOIN PurchaseSandCompany AS PurchaseSandCompany ON PurchaseSandCompany.ID = AdvancePaymentAndBalanceSummary.purchaseSandUnit
LEFT JOIN ProjectFiled AS ProjectFiled ON ProjectFiled.ID = AdvancePaymentAndBalanceSummary.project
LEFT JOIN PurchaseSandCompany AS PurchaseSandCompany ON PurchaseSandCompany.id = AdvancePaymentAndBalanceSummary.purchaseSandUnit
LEFT JOIN ProjectFiled AS ProjectFiled ON ProjectFiled.id = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount1 ,
......@@ -182,7 +182,7 @@ FROM
WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year
AND AdvancePaymentAndBalanceSummary.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary.project
UNION ALL
UNION ALL
SELECT
'合计' AS purchaseSandUnit,
'-' AS project,
......@@ -203,7 +203,7 @@ UNION ALL
octAmount.octAmount1 as octAmount,
novAmount.novAmount1 as novAmount,
decAmount.decAmount1 as decAmount
FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
LEFT JOIN(
SELECT
......@@ -327,6 +327,7 @@ FROM
) AS decAmount ON decAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year
AND AdvancePaymentAndBalanceSummary.regionalCompany = :?regionalCompanyName
ORDER BY :?totalGroupBy
</sql>
</template>
</content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsAdvQuery.jmx
......@@ -54,7 +54,7 @@
WHERE
( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate )
AND station.id IN ( :?stationList )
ORDER BY
ORDER BY :?totalGroupBy , :?subtotalGroupBy ,
stationName
</sql>
</template>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsAdvQuery.jmx
......@@ -16,45 +16,45 @@
dinasType.dinasTypeName AS dinasTypeName,
( SUM( salesSummary.saleDealAmount ) / 1000 ) AS saleDealAmount,
( SUM( salesSummary.saleAmount ) / 1000 ) AS saleAmount
FROM
FROM
SalesSummary AS salesSummary
LEFT JOIN Station AS station ON station.id = salesSummary.station
LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
WHERE
WHERE
( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate )
AND station.id IN ( :?stationList )
GROUP BY
GROUP BY
salesSummary.station,
salesSummary.dinasType
UNION ALL
SELECT
UNION ALL
SELECT
station.stationName AS stationName,
'小计' AS dinasTypeName,
( SUM( salesSummary.saleDealAmount ) / 1000 ) AS saleDealAmount,
( SUM( salesSummary.saleAmount ) / 1000 ) AS saleAmount
FROM
FROM
SalesSummary AS salesSummary
LEFT JOIN Station AS station ON station.id = salesSummary.station
LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
WHERE
WHERE
( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate )
AND station.id IN ( :?stationList )
GROUP BY
GROUP BY
salesSummary.station
UNION ALL
SELECT
UNION ALL
SELECT
'总计' AS stationName,
'———' AS dinasTypeName,
( SUM( salesSummary.saleDealAmount ) / 1000 ) AS saleDealAmount,
( SUM( salesSummary.saleAmount ) / 1000 ) AS saleAmount
FROM
FROM
SalesSummary AS salesSummary
LEFT JOIN Station AS station ON station.id = salesSummary.station
LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
WHERE
WHERE
( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate )
AND station.id IN ( :?stationList )
ORDER BY
ORDER BY :?totalGroupBy , :?subtotalGroupBy ,
stationName
</sql>
</template>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/PaymentDetailsAdvQuery.jmx
......@@ -12,80 +12,96 @@
<sql-type>SQL</sql-type>
<sql>
SELECT
artificialRecharge.id as id,
result.id AS id ,
result.createTime AS createTime ,
result.purchaseSandUnit AS purchaseSandUnit ,
result.project AS project ,
result.fundType AS fundType ,
result.rechargeAmount AS rechargeAmount ,
result.actualRefundAmount AS actualRefundAmount ,
result.remark AS remark
FROM
(SELECT
financeRefund.id AS id,
financeRefund.createTime AS createTime,
purchaseSandCompanyon.NAME AS purchaseSandUnit,
projectFiled.projectName AS project,
CASE
WHEN financeRefund.fundType = 1 THEN
'保证金退费' ELSE '预付款退费'
END AS fundType,
'-' AS rechargeAmount,
financeRefund.actualRefundAmount AS actualRefundAmount,
financeRefund.refundExplain AS remark ,
financeRefund.regionalCompany AS regionalCompanyId,
purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
projectFiled.projectName AS projectName,
CASE WHEN financeRefund.fundType = 1 THEN 'DEPOSIT' ELSE 'ADVANCE' END AS fundType1
FROM
FinanceRefund AS financeRefund
LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = financeRefund.purchaseSandCompany
LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = financeRefund.project
UNION ALL
SELECT
artificialRecharge.id AS id,
artificialRecharge.createTime AS createTime,
purchaseSandCompanyon.name AS purchaseSandUnit,
purchaseSandCompanyon.NAME AS purchaseSandUnit,
projectFiled.projectName AS project,
CASE
WHEN artificialRecharge.fundType ='DEPOSIT' then '保证金充值'
ELSE '预付款充值'
END
as fundType,
WHEN artificialRecharge.fundType = 'DEPOSIT' THEN
'保证金充值' ELSE '预付款充值'
END AS fundType,
artificialRecharge.rechargeAmount AS rechargeAmount,
'-' AS actualRefundAmount,
artificialRecharge.remark AS remark
artificialRecharge.remark AS remark ,
artificialRecharge.regionalCompany AS regionalCompanyId,
purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
projectFiled.projectName AS projectName,
artificialRecharge.fundType AS fundType1
FROM
ArtificialRecharge as artificialRecharge
LEFT JOIN PurchaseSandCompany as purchaseSandCompanyon on purchaseSandCompanyon.id = artificialRecharge.purchaseSandUnit
ArtificialRecharge AS artificialRecharge
LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = artificialRecharge.purchaseSandUnit
LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = artificialRecharge.project
WHERE artificialRecharge.regionalCompany = :?regionalCompanyId
AND (artificialRecharge.createTime &gt;= :?startDate AND artificialRecharge.createTime &lt;= :?endDate)
AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
AND projectFiled.projectName LIKE :?projectName
AND artificialRecharge.fundType = :?fundType
UNION ALL
SELECT
expenseAdjust.id as id,
expenseAdjust.id AS id,
expenseAdjust.createTime AS createTime,
purchaseSandCompanyon.name AS purchaseSandUnit,
purchaseSandCompanyon.NAME AS purchaseSandUnit,
projectFiled.projectName AS project,
CASE
WHEN expenseAdjust.fundType ='DEPOSIT' then '保证金费用调整'
ELSE '预付款费用调整'
END
as fundType,
WHEN expenseAdjust.fundType = 'DEPOSIT' THEN
'保证金费用调整' ELSE '预付款费用调整'
END AS fundType,
CASE
WHEN expenseAdjust.expenseAdjustAmount &gt;= '0' THEN
expenseAdjust.expenseAdjustAmount ELSE '-'
END AS expenseAdjustAmount,
END AS rechargeAmount,
CASE
WHEN expenseAdjust.expenseAdjustAmount &lt; '0'
THEN (- expenseAdjust.expenseAdjustAmount) ELSE '-'
WHEN expenseAdjust.expenseAdjustAmount &lt;
'0' THEN
( - expenseAdjust.expenseAdjustAmount ) ELSE '-'
END AS actualRefundAmount,
expenseAdjust.remark AS remark
expenseAdjust.remark AS remark,
expenseAdjust.regionalCompany AS regionalCompanyId,
purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
projectFiled.projectName AS projectName,
expenseAdjust.fundType AS fundType1
FROM
ExpenseAdjust as expenseAdjust
LEFT JOIN PurchaseSandCompany as purchaseSandCompanyon on purchaseSandCompanyon.id = expenseAdjust.purchaseSandUnit
ExpenseAdjust AS expenseAdjust
LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = expenseAdjust.purchaseSandUnit
LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = expenseAdjust.project
WHERE expenseAdjust.regionalCompany = :?regionalCompanyId
AND (expenseAdjust.createTime &gt;= :?startDate AND expenseAdjust.createTime &lt;= :?endDate)
AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
AND projectFiled.projectName LIKE :?projectName
AND expenseAdjust.fundType = :?fundType
UNION ALL
SELECT
financeRefund.id as id,
financeRefund.createTime AS createTime,
purchaseSandCompanyon.name AS purchaseSandUnit,
projectFiled.projectName AS project,
CASE
WHEN financeRefund.fundType ='1' THEN '保证金退费'
ELSE '预付款退费'
END
as fundType,
'-' AS rechargeAmount,
financeRefund.actualRefundAmount AS actualRefundAmount,
financeRefund.refundExplain AS remark
FROM
FinanceRefund as financeRefund
LEFT JOIN PurchaseSandCompany as purchaseSandCompanyon on purchaseSandCompanyon.id = financeRefund.purchaseSandCompany
LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = financeRefund.project
WHERE financeRefund.regionalCompany = :?regionalCompanyId
AND (financeRefund.createTime &gt;= :?startDate AND financeRefund.createTime &lt;= :?endDate)
AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
AND projectFiled.projectName LIKE :?projectName
AND ( case when 'DEPOSIT' = :?fundType then '1' else '0' end ) = financeRefund.fundType
ORDER BY createTime DESC
) AS result
WHERE result.regionalCompanyId = :?regionalCompanyId
AND ( result.createTime &gt;= :?startDate AND result.createTime &lt;= :?endDate )
AND result.purchaseSandCompanyonName LIKE :?purchaseSandCompanyonName
AND result.projectName LIKE :?projectName
AND result.fundType1 = :?fundType
ORDER BY result.createTime DESC
</sql>
</template>
</content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesSummaryAdvQuery.jmx
......@@ -29,7 +29,7 @@
octAmount.octAmount1 as octAmount,
novAmount.novAmount1 as novAmount,
decAmount.decAmount1 as decAmount
FROM
FROM
SalesSummary as salesSummary
LEFT JOIN Station station ON station.id = salesSummary.station
LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType
......@@ -42,7 +42,7 @@ FROM
WHERE
salesSummary1.dealMonth = 1
) AS janAmount ON janAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dealYear as dealYear1,
SUM( salesSummary1.saleAmount ) AS febAmount1
......@@ -51,7 +51,7 @@ LEFT JOIN (
WHERE
salesSummary1.dealMonth = 2
) AS febAmount ON febAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dealYear as dealYear1,
SUM( salesSummary1.saleAmount ) AS marAmount1
......@@ -60,7 +60,7 @@ LEFT JOIN (
WHERE
salesSummary1.dealMonth = 3
) AS marAmount ON marAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dealYear as dealYear1,
SUM( salesSummary1.saleAmount ) AS aprAmount1
......@@ -69,7 +69,7 @@ LEFT JOIN (
WHERE
salesSummary1.dealMonth = 4
) AS aprAmount ON aprAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dealYear as dealYear1,
SUM( salesSummary1.saleAmount ) AS mayAmount1
......@@ -78,7 +78,7 @@ LEFT JOIN (
WHERE
salesSummary1.dealMonth = 5
) AS mayAmount ON mayAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dealYear as dealYear1,
SUM( salesSummary1.saleAmount ) AS junAmount1
......@@ -87,7 +87,7 @@ LEFT JOIN (
WHERE
salesSummary1.dealMonth = 6
) AS junAmount ON junAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dealYear as dealYear1,
SUM( salesSummary1.saleAmount ) AS julAmount1
......@@ -96,7 +96,7 @@ LEFT JOIN (
WHERE
salesSummary1.dealMonth = 7
) AS julAmount ON julAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dealYear as dealYear1,
SUM( salesSummary1.saleAmount ) AS augAmount1
......@@ -105,7 +105,7 @@ LEFT JOIN (
WHERE
salesSummary1.dealMonth = 8
) AS augAmount ON augAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dealYear as dealYear1,
SUM( salesSummary1.saleAmount ) AS septAmount1
......@@ -114,7 +114,7 @@ LEFT JOIN (
WHERE
salesSummary1.dealMonth = 9
) AS septAmount ON septAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dealYear as dealYear1,
SUM( salesSummary1.saleAmount ) AS octAmount1
......@@ -123,7 +123,7 @@ LEFT JOIN (
WHERE
salesSummary1.dealMonth = 10
) AS octAmount ON octAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dealYear as dealYear1,
SUM( salesSummary1.saleAmount ) AS novAmount1
......@@ -132,7 +132,7 @@ LEFT JOIN (
WHERE
salesSummary1.dealMonth = 11
) AS novAmount ON novAmount.dealYear1 = salesSummary.dealYear
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dealYear as dealYear1,
SUM( salesSummary1.saleAmount ) AS decAmount1
......@@ -144,8 +144,8 @@ LEFT JOIN (
where salesSummary.dealYear = :?year
AND salesSummary.station IN ( :?stationList )
GROUP BY salesSummary.dealYear
UNION ALL
SELECT
UNION ALL
SELECT
station.stationName as station,
'小计' as dinasType,
SUM(salesSummary.saleDealAmount) as saleDealAmount,
......@@ -163,7 +163,7 @@ SELECT
octAmount.octAmount1 as octAmount,
novAmount.novAmount1 as novAmount,
decAmount.decAmount1 as decAmount
FROM
FROM
SalesSummary salesSummary
LEFT JOIN Station station ON station.id = salesSummary.station
LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType
......@@ -178,7 +178,7 @@ FROM
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station
) AS janAmountTab ON janAmount.station1 = salesSummary.station
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS febAmount1
......@@ -189,7 +189,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station
) AS febAmount ON febAmount.station1 = salesSummary.station
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS marAmount1
......@@ -200,7 +200,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station
) AS marAmount ON marAmount.station1 = salesSummary.station
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS aprAmount1
......@@ -211,7 +211,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station
) AS aprAmount ON aprAmount.station1 = salesSummary.station
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS mayAmount1
......@@ -222,7 +222,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station
) AS mayAmount ON mayAmount.station1 = salesSummary.station
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS junAmount1
......@@ -233,7 +233,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station
) AS junAmount ON junAmount.station1 = salesSummary.station
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS julAmount1
......@@ -244,7 +244,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station
) AS julAmount ON julAmount.station1 = salesSummary.station
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS augAmount1
......@@ -255,7 +255,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station
) AS augAmount ON augAmount.station1 = salesSummary.station
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS septAmount1
......@@ -266,7 +266,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station
) AS septAmount ON septAmount.station1 = salesSummary.station
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS octAmount1
......@@ -277,7 +277,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station
) AS octAmount ON octAmount.station1 = salesSummary.station
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS novAmount1
......@@ -288,7 +288,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station
) AS novAmount ON novAmount.station1 = salesSummary.station
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.station AS station1 ,
SUM( salesSummary1.saleAmount ) AS decAmount1
......@@ -302,8 +302,8 @@ LEFT JOIN (
where salesSummary.dealYear = :?year
AND salesSummary.station IN ( :?stationList )
GROUP BY station
UNION ALL
SELECT
UNION ALL
SELECT
station.stationName as station,
dinasType.dinasTypeName as dinasType,
SUM(salesSummary.saleDealAmount) as saleDealAmount,
......@@ -321,7 +321,7 @@ SELECT
octAmount.octAmount1 as octAmount,
novAmount.novAmount1 as novAmount,
decAmount.decAmount1 as decAmount
FROM
FROM
SalesSummary salesSummary
LEFT JOIN Station station ON station.id = salesSummary.station
LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType
......@@ -337,7 +337,7 @@ FROM
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS janAmountTab ON janAmount.station1 = salesSummary.station AND janAmount.dinasType1 = salesSummary.dinasType
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dinasType AS dinasType1,
salesSummary1.station AS station1 ,
......@@ -349,7 +349,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS febAmount ON febAmount.station1 = salesSummary.station AND febAmount.dinasType1 = salesSummary.dinasType
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dinasType AS dinasType1,
salesSummary1.station AS station1 ,
......@@ -361,7 +361,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS marAmount ON marAmount.station1 = salesSummary.station AND marAmount.dinasType1 = salesSummary.dinasType
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dinasType AS dinasType1,
salesSummary1.station AS station1 ,
......@@ -373,7 +373,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS aprAmount ON aprAmount.station1 = salesSummary.station AND aprAmount.dinasType1 = salesSummary.dinasType
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dinasType AS dinasType1,
salesSummary1.station AS station1 ,
......@@ -385,7 +385,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS mayAmount ON mayAmount.station1 = salesSummary.station AND mayAmount.dinasType1 = salesSummary.dinasType
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dinasType AS dinasType1,
salesSummary1.station AS station1 ,
......@@ -397,7 +397,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS junAmount ON junAmount.station1 = salesSummary.station AND junAmount.dinasType1 = salesSummary.dinasType
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dinasType AS dinasType1,
salesSummary1.station AS station1 ,
......@@ -409,7 +409,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS julAmount ON julAmount.station1 = salesSummary.station AND julAmount.dinasType1 = salesSummary.dinasType
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dinasType AS dinasType1,
salesSummary1.station AS station1 ,
......@@ -421,7 +421,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS augAmount ON augAmount.station1 = salesSummary.station AND augAmount.dinasType1 = salesSummary.dinasType
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dinasType AS dinasType1,
salesSummary1.station AS station1 ,
......@@ -433,7 +433,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS septAmount ON septAmount.station1 = salesSummary.station AND septAmount.dinasType1 = salesSummary.dinasType
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dinasType AS dinasType1,
salesSummary1.station AS station1 ,
......@@ -445,7 +445,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS octAmount ON octAmount.station1 = salesSummary.station AND octAmount.dinasType1 = salesSummary.dinasType
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dinasType AS dinasType1,
salesSummary1.station AS station1 ,
......@@ -457,7 +457,7 @@ LEFT JOIN (
AND salesSummary1.dealYear = :?year
GROUP BY salesSummary1.station,salesSummary1.dinasType
) AS novAmount ON novAmount.station1 = salesSummary.station AND novAmount.dinasType1 = salesSummary.dinasType
LEFT JOIN (
LEFT JOIN (
SELECT
salesSummary1.dinasType AS dinasType1,
salesSummary1.station AS station1 ,
......@@ -472,7 +472,7 @@ LEFT JOIN (
WHERE salesSummary.dealYear = :?year
AND salesSummary.station IN ( :?stationList )
GROUP BY station,dinasType
ORDER BY
ORDER BY :?totalGroupBy , :?subtotalGroupBy ,
station,saleDealAmount DESC
</sql>
</template>
......
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