Skip to content

C
cloud-fb
Commit b8660ca6 by 焦凯
Options

Merge branch 'feature/sales_record_sync' into 'develop' 

统计测试版本-2021-05-12-13:53

See merge request kunlun/xyst_dinas/xyst_dinas_backend!10
parents d74c0b4a da994550
Showing with 56 additions and 54 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/AdvancePaymentBalanceSumAdvQuery.jmx
......@@ -293,7 +293,7 @@ FROM
AdvancePaymentAndBalanceSummary AS AdvancePaymentAndBalanceSummary
WHERE AdvancePaymentAndBalanceSummary.dealYear = :?year
AND AdvancePaymentAndBalanceSummary.regionalCompany = :?regionalCompanyName
ORDER BY (purchaseSandUnit = '合计') ASC
ORDER BY purchaseSandUnit = '合计' ASC
</sql>
</template>
</content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsAdvQuery.jmx
......@@ -22,7 +22,7 @@ FROM
LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType
WHERE
( SalesSummary.dealTime &gt;= :?startDate AND SalesSummary.dealTime &lt; :?endDate )
AND Station.id IN :?stationList
AND Station.id IN ( :?stationList )
GROUP BY
SalesSummary.station,
SalesSummary.dinasType UNION ALL
......@@ -37,7 +37,7 @@ FROM
LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType
WHERE
( SalesSummary.dealTime &gt;= :?startDate AND SalesSummary.dealTime &lt; :?endDate )
AND Station.id IN :?stationList
AND Station.id IN ( :?stationList )
GROUP BY
SalesSummary.station UNION ALL
SELECT
......@@ -51,12 +51,12 @@ FROM
LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType
WHERE
( SalesSummary.dealTime &gt;= :?startDate AND SalesSummary.dealTime &lt; :?endDate )
AND Station.id IN :?stationList
AND Station.id IN ( :?stationList )
ORDER BY
( stationName = '总计' ) DESC,
stationName = '总计' DESC,
stationName,
( dinasTypeName = '小计' ) ASC
dinasTypeName = '小计' ASC
</sql>
</template>
</content>
</metadata>
</metadata>
\ No newline at end of file
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsAdvQuery.jmx
......@@ -22,7 +22,7 @@ FROM
LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType
WHERE
( SalesSummary.dealTime &gt;= :?startDate AND SalesSummary.dealTime &lt; :?endDate )
AND Station.id IN :?stationList
AND Station.id IN ( :?stationList )
GROUP BY
SalesSummary.station,
SalesSummary.dinasType UNION ALL
......@@ -37,7 +37,7 @@ FROM
LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType
WHERE
( SalesSummary.dealTime &gt;= :?startDate AND SalesSummary.dealTime &lt; :?endDate )
AND Station.id IN :?stationList
AND Station.id IN ( :?stationList )
GROUP BY
SalesSummary.station UNION ALL
SELECT
......@@ -51,12 +51,12 @@ FROM
LEFT JOIN DinasType AS DinasType ON DinasType.id = SalesSummary.dinasType
WHERE
( SalesSummary.dealTime &gt;= :?startDate AND SalesSummary.dealTime &lt; :?endDate )
AND Station.id IN :?stationList
AND Station.id IN ( :?stationList )
ORDER BY
( stationName = '总计' ) DESC,
stationName = '总计' DESC,
stationName,
( dinasTypeName = '小计' ) ASC
dinasTypeName = '小计' ASC
</sql>
</template>
</content>
</metadata>
</metadata>
\ No newline at end of file
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesSummaryAdvQuery.jmx
......@@ -24,7 +24,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '1'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS janAmount,
(
......@@ -34,7 +34,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '2'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS febAmount,
(
......@@ -44,7 +44,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '3'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS marAmount,
(
......@@ -54,7 +54,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '4'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS aprAmount,
(
......@@ -64,7 +64,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '5'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS mayAmount,
(
......@@ -74,7 +74,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '6'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS junAmount,
(
......@@ -84,7 +84,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '7'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS julAmount,
(
......@@ -94,7 +94,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '8'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS augAmount,
(
......@@ -104,7 +104,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '9'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS septAmount,
(
......@@ -114,7 +114,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '10'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS octAmount,
(
......@@ -124,7 +124,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '11'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS novAmount,
(
......@@ -134,7 +134,7 @@
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '12'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.dealYear = :?year
) AS decAmount
FROM
......@@ -142,7 +142,7 @@ FROM
LEFT JOIN Station station ON station.id = salesSummary.station
LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType
where salesSummary.deal_year = :?year
AND salesSummary.station IN ( :?stationList )
GROUP BY salesSummary.deal_year
UNION ALL
SELECT
......@@ -158,7 +158,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '1'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS janAmount,
......@@ -169,7 +169,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '2'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS febAmount,
......@@ -180,7 +180,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '3'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS marAmount,
......@@ -191,7 +191,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '4'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS aprAmount,
......@@ -202,7 +202,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '5'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS mayAmount,
......@@ -213,7 +213,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '6'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS junAmount,
......@@ -224,7 +224,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '7'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS julAmount,
......@@ -235,7 +235,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '8'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS augAmount,
......@@ -246,7 +246,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '9'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS septAmount,
......@@ -257,7 +257,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '10'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS octAmount,
......@@ -268,7 +268,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '11'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS novAmount,
......@@ -279,7 +279,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '12'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dealYear = :?year
) AS decAmount
......@@ -288,7 +288,7 @@ FROM
LEFT JOIN Station station ON station.id = salesSummary.station
LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType
where salesSummary.deal_year = :?year
AND salesSummary.station IN ( :?stationList )
GROUP BY station
UNION ALL
SELECT
......@@ -304,7 +304,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '1'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -316,7 +316,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '2'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -328,7 +328,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '3'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -340,7 +340,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '4'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -352,7 +352,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '5'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -364,7 +364,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '6'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -376,7 +376,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '7'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -388,7 +388,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '8'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -400,7 +400,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '9'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -412,7 +412,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '10'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -424,7 +424,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '11'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -436,7 +436,7 @@ SELECT
SalesSummary SalesSummary1
WHERE
SalesSummary1.dealMonth = '12'
AND salesSummary1.station IN ( :?stationList )
AND SalesSummary1.station = SalesSummary.station
AND SalesSummary1.dinasType = SalesSummary.dinasType
AND SalesSummary1.dealYear = :?year
......@@ -446,10 +446,10 @@ FROM
LEFT JOIN Station station ON station.id = salesSummary.station
LEFT JOIN DinasType dinasType ON dinasType.id = salesSummary.dinasType
WHERE salesSummary.deal_year = :?year
AND salesSummary.station IN ( :?stationList )
GROUP BY station,dinasType
ORDER BY station = '总计' DESC,
station,saleDealAmount DESC
</sql>
</template>
</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