Skip to content

C
cloud-fb
Commit 1ca44b10 by wukaiqiang
Options

Merge branch 'feature/sales_record_sync' into 'develop' 

更新统计文件

See merge request kunlun/xyst_dinas/xyst_dinas_backend!18
parents faec4b5b b0bf32d0
Showing with 72 additions and 72 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/AdvancePaymentBalanceSumAdvQuery.jmx
......@@ -42,7 +42,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '1'
AdvancePaymentAndBalanceSummary1.dealMonth = 1
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -54,7 +54,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '2'
AdvancePaymentAndBalanceSummary1.dealMonth = 2
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -66,7 +66,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '3'
AdvancePaymentAndBalanceSummary1.dealMonth = 3
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -78,7 +78,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '4'
AdvancePaymentAndBalanceSummary1.dealMonth = 4
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -90,7 +90,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '5'
AdvancePaymentAndBalanceSummary1.dealMonth = 5
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -102,7 +102,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '6'
AdvancePaymentAndBalanceSummary1.dealMonth = 6
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -114,7 +114,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '7'
AdvancePaymentAndBalanceSummary1.dealMonth = 7
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -126,7 +126,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '8'
AdvancePaymentAndBalanceSummary1.dealMonth = 8
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -138,7 +138,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '9'
AdvancePaymentAndBalanceSummary1.dealMonth = 9
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -150,7 +150,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '10'
AdvancePaymentAndBalanceSummary1.dealMonth = 10
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -162,7 +162,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '11'
AdvancePaymentAndBalanceSummary1.dealMonth = 11
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -174,7 +174,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '12'
AdvancePaymentAndBalanceSummary1.dealMonth = 12
AND AdvancePaymentAndBalanceSummary1.dealYear = :?year
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
GROUP BY AdvancePaymentAndBalanceSummary1.project
......@@ -212,7 +212,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '1'
AdvancePaymentAndBalanceSummary1.dealMonth = 1
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS janAmount ON janAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
......@@ -222,7 +222,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '2'
AdvancePaymentAndBalanceSummary1.dealMonth = 2
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS febAmount ON febAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
......@@ -232,7 +232,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '3'
AdvancePaymentAndBalanceSummary1.dealMonth = 3
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS marAmount ON marAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
......@@ -242,7 +242,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '4'
AdvancePaymentAndBalanceSummary1.dealMonth = 4
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS aprAmount ON aprAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
......@@ -252,7 +252,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '5'
AdvancePaymentAndBalanceSummary1.dealMonth = 5
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS mayAmount ON mayAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
......@@ -262,7 +262,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '6'
AdvancePaymentAndBalanceSummary1.dealMonth = 6
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS junAmount ON junAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
......@@ -272,7 +272,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '7'
AdvancePaymentAndBalanceSummary1.dealMonth = 7
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS julAmount ON julAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
......@@ -282,7 +282,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '8'
AdvancePaymentAndBalanceSummary1.dealMonth = 8
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS augAmount ON augAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
......@@ -292,7 +292,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '9'
AdvancePaymentAndBalanceSummary1.dealMonth = 9
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS septAmount ON septAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
......@@ -302,7 +302,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '10'
AdvancePaymentAndBalanceSummary1.dealMonth = 10
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS octAmount ON octAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
......@@ -312,7 +312,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '11'
AdvancePaymentAndBalanceSummary1.dealMonth = 11
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS novAmount ON novAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
LEFT JOIN(
......@@ -322,7 +322,7 @@ FROM
FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary1
WHERE
AdvancePaymentAndBalanceSummary1.dealMonth = '12'
AdvancePaymentAndBalanceSummary1.dealMonth = 12
AND AdvancePaymentAndBalanceSummary1.regionalCompany = :?regionalCompanyName
) AS decAmount ON decAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsAdvQuery.jmx
......@@ -21,7 +21,7 @@
LEFT JOIN Station AS station ON station.id = salesSummary.station
LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
WHERE
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime < :?endDate )
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime <= :?endDate )
AND station.id IN ( :?stationList )
GROUP BY
salesSummary.station,
......@@ -37,7 +37,7 @@
LEFT JOIN Station AS station ON station.id = salesSummary.station
LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
WHERE
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime < :?endDate )
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime <= :?endDate )
AND station.id IN ( :?stationList )
GROUP BY
salesSummary.station
......@@ -52,7 +52,7 @@
LEFT JOIN Station AS station ON station.id = salesSummary.station
LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
WHERE
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime < :?endDate )
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime <= :?endDate )
AND station.id IN ( :?stationList )
ORDER BY
stationName
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsAdvQuery.jmx
......@@ -21,7 +21,7 @@ FROM
LEFT JOIN Station AS station ON station.id = salesSummary.station
LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
WHERE
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime < :?endDate )
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime <= :?endDate )
AND station.id IN ( :?stationList )
GROUP BY
salesSummary.station,
......@@ -37,7 +37,7 @@ FROM
LEFT JOIN Station AS station ON station.id = salesSummary.station
LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
WHERE
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime < :?endDate )
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime <= :?endDate )
AND station.id IN ( :?stationList )
GROUP BY
salesSummary.station
......@@ -52,7 +52,7 @@ FROM
LEFT JOIN Station AS station ON station.id = salesSummary.station
LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
WHERE
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime < :?endDate )
( salesSummary.dealTime >= :?startDate AND salesSummary.dealTime <= :?endDate )
AND station.id IN ( :?stationList )
ORDER BY
stationName
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/PaymentDetailsAdvQuery.jmx
......@@ -13,7 +13,7 @@
<sql>
SELECT
artificialRecharge.id as id,
artificialRecharge.createTime AS createTime,
artificialRecharge.createTime AS createTime,
purchaseSandCompanyon.name AS purchaseSandUnit,
projectFiled.projectName AS project,
CASE
......@@ -29,7 +29,7 @@
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 (artificialRecharge.createTime &gt;= :?startDate AND artificialRecharge.createTime &lt;= :?endDate)
AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
AND projectFiled.projectName LIKE :?projectName
AND artificialRecharge.fundType = :?fundType
......@@ -46,11 +46,11 @@
as fundType,
CASE
WHEN expenseAdjust.expenseAdjustAmount &gt;= '0' THEN
expenseAdjust.expenseAdjustAmount ELSE ''
expenseAdjust.expenseAdjustAmount ELSE '-'
END AS expenseAdjustAmount,
CASE
WHEN expenseAdjust.expenseAdjustAmount &lt; '0'
THEN (- expenseAdjust.expenseAdjustAmount) ELSE ''
THEN (- expenseAdjust.expenseAdjustAmount) ELSE '-'
END AS actualRefundAmount,
expenseAdjust.remark AS remark
FROM
......@@ -58,7 +58,7 @@
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 (expenseAdjust.createTime &gt;= :?startDate AND expenseAdjust.createTime &lt;= :?endDate)
AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
AND projectFiled.projectName LIKE :?projectName
AND expenseAdjust.fundType = :?fundType
......@@ -81,7 +81,7 @@
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 (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
......
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