Skip to content

C
cloud-fb
Commit 67a2a99e by wukaiqiang
Options

Merge branch 'feature/sales_record_sync' into 'develop' 

统计整体调整

See merge request kunlun/xyst_dinas/xyst_dinas_backend!14
parents bd5d8b23 80a105bf
Showing with 145 additions and 116 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/AdvancePaymentBalanceSumAdvQuery.jmx
......@@ -19,281 +19,314 @@
SUM(AdvancePaymentAndBalanceSummary.totalAdvancePayment) AS totalAdvancePayment,
SUM(AdvancePaymentAndBalanceSummary.advancePaymentRefundAmount + AdvancePaymentAndBalanceSummary.marginRefund) AS refundAmount,
SUM(AdvancePaymentAndBalanceSummary.advanceBalance) AS advanceBalance,
(
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
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(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '1'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS janAmount,
(
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS janAmount ON janAmount.project1 = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '2'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS febAmount,
(
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS febAmount ON febAmount.project1 = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '3'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS marAmount,
(
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS marAmount ON marAmount.project1 = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '4'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS aprAmount,
(
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS aprAmount ON aprAmount.project1 = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '5'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS mayAmount,
(
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS mayAmount ON mayAmount.project1 = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '6'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS junAmount,
(
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS junAmount ON junAmount.project1 = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '7'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS julAmount,
(
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS julAmount ON julAmount.project1 = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '8'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS augAmount,
(
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS augAmount ON augAmount.project1 = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '9'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS septAmount,
(
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS septAmount ON septAmount.project1 = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '10'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS octAmount,
(
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS octAmount ON octAmount.project1 = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '11'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS novAmount,
(
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS novAmount ON novAmount.project1 = AdvancePaymentAndBalanceSummary.project
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount1 ,
AdvancePaymentAndBalanceSummary1.project AS project1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '12'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.project = AdvancePaymentAndBalanceSummary.project
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS decAmount
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
LEFT JOIN PurchaseSandCompany AS PurchaseSandCompany ON PurchaseSandCompany.ID = AdvancePaymentAndBalanceSummary.purchaseSandUnit
LEFT JOIN ProjectFiled AS ProjectFiled ON ProjectFiled.ID = AdvancePaymentAndBalanceSummary.project
GROUP BY AdvancePaymentAndBalanceSummary1.project
) AS decAmount ON decAmount.project1 = AdvancePaymentAndBalanceSummary.project
WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year
AND AdvancePaymentAndBalanceSummary.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary.project
UNION ALL
SELECT
'合计' AS purchaseSandUnit,
' ' AS project,
'-' AS project,
SUM(AdvancePaymentAndBalanceSummary.lastYearAdvance) AS lastYearAdvance,
SUM(AdvancePaymentAndBalanceSummary.paymentSales) AS paymentSales,
SUM(AdvancePaymentAndBalanceSummary.totalAdvancePayment) AS totalAdvancePayment,
SUM(AdvancePaymentAndBalanceSummary.advancePaymentRefundAmount + AdvancePaymentAndBalanceSummary.marginRefund) AS refundAmount,
SUM(AdvancePaymentAndBalanceSummary.advanceBalance) AS advanceBalance,
(
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
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS janAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '1'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS janAmount,
(
) AS janAmount ON janAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS febAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '2'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS febAmount,
(
) AS febAmount ON febAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS marAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '3'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS marAmount,
(
) AS marAmount ON marAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS aprAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '4'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS aprAmount,
(
) AS aprAmount ON aprAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS mayAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '5'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS mayAmount,
(
) AS mayAmount ON mayAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS junAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '6'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS junAmount,
(
) AS junAmount ON junAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS julAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '7'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS julAmount,
(
) AS julAmount ON julAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS augAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '8'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS augAmount,
(
) AS augAmount ON augAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS septAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '9'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS septAmount,
(
) AS septAmount ON septAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS octAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '10'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS octAmount,
(
) AS octAmount ON octAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS novAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '11'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS novAmount,
(
) AS novAmount ON novAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
SELECT
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount
SUM( AdvancePaymentAndBalanceSummary1.paymentSales ) AS decAmount1 ,
AdvancePaymentAndBalanceSummary1.dealYear AS dealYear1
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '12'
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS decAmount
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
) AS decAmount ON decAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year
AND AdvancePaymentAndBalanceSummary.regionalCompany = :?regionalCompanyName
ORDER BY purchaseSandUnit = '合计' ASC
</sql>
</template>
</content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsAdvQuery.jmx
......@@ -42,7 +42,7 @@ GROUP BY
SalesSummary.station UNION ALL
SELECT
'总计' AS stationName,
'————' AS dinasTypeName,
'———' AS dinasTypeName,
SUM( SalesSummary.saleDealAmount ) AS saleDealAmount,
SUM( SalesSummary.saleAmount ) AS saleAmount
FROM
......@@ -53,9 +53,7 @@ WHERE
( SalesSummary.dealTime &gt;= :?startDate AND SalesSummary.dealTime &lt; :?endDate )
AND Station.id IN ( :?stationList )
ORDER BY
stationName = '总计' DESC,
stationName,
dinasTypeName = '小计' ASC
stationName
</sql>
</template>
</content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsAdvQuery.jmx
......@@ -42,7 +42,7 @@ GROUP BY
SalesSummary.station UNION ALL
SELECT
'总计' AS stationName,
'————' AS dinasTypeName,
'———' AS dinasTypeName,
SUM( SalesSummary.saleDealAmount ) AS saleDealAmount,
SUM( SalesSummary.saleAmount ) AS saleAmount
FROM
......@@ -53,9 +53,7 @@ WHERE
( SalesSummary.dealTime &gt;= :?startDate AND SalesSummary.dealTime &lt; :?endDate )
AND Station.id IN ( :?stationList )
ORDER BY
stationName = '总计' DESC,
stationName,
dinasTypeName = '小计' ASC
stationName
</sql>
</template>
</content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/PaymentDetailsAdvQuery.jmx
......@@ -22,7 +22,7 @@
END
as fundType,
artificialRecharge.rechargeAmount AS rechargeAmount,
'' AS actualRefundAmount,
'-' AS actualRefundAmount,
artificialRecharge.remark AS remark
FROM
ArtificialRecharge as artificialRecharge
......@@ -73,7 +73,7 @@
ELSE '预付款退费'
END
as fundType,
'' AS rechargeAmount,
'-' AS rechargeAmount,
financeRefund.actualRefundAmount AS actualRefundAmount,
financeRefund.refundExplain AS remark
FROM
......
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