Skip to content

C
cloud-fb
Commit da994550 by wukaiqiang
Options

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

parent d74c0b4a
Showing with 52 additions and 52 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,11 +51,11 @@ 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>
......
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,11 +51,11 @@ 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>
......
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