Skip to content

C
cloud-fb
Commit a865cf29 by 史文博
Options

Merge branch 'feature/form_statistics_05' into 'develop' 

修改TOP系限制条件。新增资金专题资金舱

See merge request kunlun/xyst_dinas/xyst_dinas_backend!62
parents 6f751aa8 7bd8e3df
Showing with 337 additions and 5 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ContractTopDescStatisticsAdvQuery.jmx
......@@ -13,8 +13,12 @@
<sql>
SELECT
purchaseSandCompany.name AS name,
contract.amount AS amount ,
contract.dinasAmount AS dinasAmount
CASE WHEN
contract.amount IS NULL THEN 0 ELSE contract.amount
END AS amount ,
CASE WHEN
contract.dinasAmount IS NULL THEN 0 ELSE contract.dinasAmount
END AS dinasAmount
FROM
Contract AS contract
LEFT JOIN PurchaseSandCompany AS purchaseSandCompany on purchaseSandCompany.id = contract.purchaseSandUnit
......@@ -22,8 +26,8 @@
AND contract.approveState = 2
AND contract.contractState &lt;&gt; 'MODIFIED'
AND contract.regionalCompany = :?regionalCompany
ORDER BY :?orderBy DESC
LIMIT :?limitNumber
</sql>
</template>
</content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/FinanceTankSummaryAdvQuery.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>2c6a5eff-9597-4d23-ba50-da5d833e2fdb</id>
<name>com.xyst.dinas.statistics.advanquery.FinanceTankSummaryAdvQuery</name>
<title>资金舱</title>
<description>资金舱</description>
<define>advanced.query.template</define>
<define-version>1.0</define-version>
<content>
<template>
<sql-type>SQL</sql-type>
<sql>
SELECT
results.regionalCompany AS regionalCompany,
xystOrganization.NAME AS regionalCompanyName,
( results.rechargeAmountAdvance + results.expenseAdjustAmountAdvance + results.rechargeAmountDeposit + results.expenseAdjustAmountDeposit ) AS CollectionTotal,
( results.rechargeAmountAdvance + results.expenseAdjustAmountAdvance ) AS advanceCollectionTotal,
( results.rechargeAmountDeposit + results.expenseAdjustAmountDeposit ) AS depositCollectionTotal,
( results.actualRefundAmountAdvance + results.actualRefundAmountDeposit ) AS RefundTotal,
results.actualRefundAmountAdvance AS advanceRefundTotal,
results.actualRefundAmountDeposit AS depositRefundTotal
FROM
(
SELECT
artificialRechargeAdvance.regionalCompany,
CASE
WHEN artificialRechargeAdvance.rechargeAmount IS NULL THEN
0 ELSE artificialRechargeAdvance.rechargeAmount
END AS rechargeAmountAdvance,
CASE
WHEN expenseAdjustAdvance.expenseAdjustAmount IS NULL THEN
0 ELSE expenseAdjustAdvance.expenseAdjustAmount
END AS expenseAdjustAmountAdvance,
CASE
WHEN artificialRechargeDeposit.rechargeAmount IS NULL THEN
0 ELSE artificialRechargeDeposit.rechargeAmount
END AS rechargeAmountDeposit,
CASE
WHEN expenseAdjustDeposit.expenseAdjustAmount IS NULL THEN
0 ELSE expenseAdjustDeposit.expenseAdjustAmount
END AS expenseAdjustAmountDeposit,
CASE
WHEN financeRefundAdvance.actualRefundAmount IS NULL THEN
0 ELSE financeRefundAdvance.actualRefundAmount
END AS actualRefundAmountAdvance,
CASE
WHEN financeRefundDeposit.actualRefundAmount IS NULL THEN
0 ELSE financeRefundDeposit.actualRefundAmount
END AS actualRefundAmountDeposit
FROM
(
SELECT
artificialRecharge1.regionalCompany AS regionalCompany,
artificialRecharge1.fundType AS fundType,
CASE
WHEN SUM( artificialRecharge1.rechargeAmount ) IS NULL THEN
0 ELSE SUM( artificialRecharge1.rechargeAmount )
END AS rechargeAmount
FROM
ArtificialRecharge AS artificialRecharge1
WHERE
artificialRecharge1.fundType = 'ADVANCE'
AND artificialRecharge1.createTime &gt;= :?startDate
AND artificialRecharge1.createTime &lt;= :?endDate
GROUP BY
artificialRecharge1.regionalCompany
) AS artificialRechargeAdvance
LEFT JOIN (
SELECT
expenseAdjust1.regionalCompany AS regionalCompany,
expenseAdjust1.fundType AS fundType,
CASE
WHEN SUM( expenseAdjust1.expenseAdjustAmount ) IS NULL THEN
0 ELSE SUM( expenseAdjust1.expenseAdjustAmount )
END AS expenseAdjustAmount
FROM
ExpenseAdjust AS expenseAdjust1
WHERE
expenseAdjust1.fundType = 'ADVANCE'
AND expenseAdjust1.createTime &gt;= :?startDate
AND expenseAdjust1.createTime &lt;= :?endDate
GROUP BY
expenseAdjust1.regionalCompany
) AS expenseAdjustAdvance ON expenseAdjustAdvance.regionalCompany = artificialRechargeAdvance.regionalCompany
LEFT JOIN (
SELECT
artificialRecharge1.regionalCompany AS regionalCompany,
CASE
WHEN SUM( artificialRecharge1.rechargeAmount ) IS NULL THEN
0 ELSE SUM( artificialRecharge1.rechargeAmount )
END AS rechargeAmount
FROM
ArtificialRecharge AS artificialRecharge1
WHERE
artificialRecharge1.fundType = 'DEPOSIT'
AND artificialRecharge1.createTime &gt;= :?startDate
AND artificialRecharge1.createTime &lt;= :?endDate
GROUP BY
artificialRecharge1.regionalCompany
) AS artificialRechargeDeposit ON artificialRechargeDeposit.regionalCompany = artificialRechargeAdvance.regionalCompany
LEFT JOIN (
SELECT
expenseAdjust1.regionalCompany AS regionalCompany,
CASE
WHEN SUM( expenseAdjust1.expenseAdjustAmount ) IS NULL THEN
0 ELSE SUM( expenseAdjust1.expenseAdjustAmount )
END AS expenseAdjustAmount
FROM
ExpenseAdjust AS expenseAdjust1
WHERE
expenseAdjust1.fundType = 'DEPOSIT'
AND expenseAdjust1.createTime &gt;= :?startDate
AND expenseAdjust1.createTime &lt;= :?endDate
GROUP BY
expenseAdjust1.regionalCompany
) AS expenseAdjustDeposit ON expenseAdjustDeposit.regionalCompany = artificialRechargeAdvance.regionalCompany
LEFT JOIN (
SELECT
financeRefund1.regionalCompany AS regionalCompany,
CASE
WHEN SUM( financeRefund1.actualRefundAmount ) IS NULL THEN
0 ELSE SUM( financeRefund1.actualRefundAmount )
END AS actualRefundAmount
FROM
FinanceRefund AS financeRefund1
WHERE
financeRefund1.refundState = 'REFUNDED'
AND financeRefund1.fundType = 0
AND financeRefund1.refundTime &gt;= :?startDate
AND financeRefund1.refundTime &lt;= :?endDate
GROUP BY
financeRefund1.regionalCompany
) AS financeRefundAdvance ON financeRefundAdvance.regionalCompany = artificialRechargeAdvance.regionalCompany
LEFT JOIN (
SELECT
financeRefund1.regionalCompany AS regionalCompany,
CASE
WHEN SUM( financeRefund1.actualRefundAmount ) IS NULL THEN
0 ELSE SUM( financeRefund1.actualRefundAmount )
END AS actualRefundAmount
FROM
FinanceRefund AS financeRefund1
WHERE
financeRefund1.refundState = 'REFUNDED'
AND financeRefund1.fundType = 1
AND financeRefund1.refundTime &gt;= :?startDate
AND financeRefund1.refundTime &lt;= :?endDate
GROUP BY
financeRefund1.regionalCompany
) AS financeRefundDeposit ON financeRefundDeposit.regionalCompany = artificialRechargeAdvance.regionalCompany
) AS results
LEFT JOIN xystOrganization AS xystOrganization ON results.regionalCompany = xystOrganization.id
WHERE 1=1
AND xystOrganization.type &lt;&gt; 'GROUP_COMPANY'
AND results.regionalCompany = :?regionalCompanyId
ORDER BY
xystOrganization.createTime
</sql>
</template>
</content>
</metadata>
\ No newline at end of file
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/FinanceTankSummaryQueryView.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>e04cc9e0-bc1a-41b0-9606-ac7d58665d21</id>
<name>com.xyst.dinas.statistics.advanquery.FinanceTankSummaryQueryView</name>
<title>资金舱</title>
<description>资金舱</description>
<define>advanced.query.view</define>
<define-version>1.0</define-version>
<content>
<view>
{
"name": "资金舱",
"title": "资金舱",
"description": "资金舱",
"actions": [],
"scenes" : {
"isShowScenes" : true
},
"fuzzySearch": [
],
"isShowTabCountZero": true,
"groups": [
{
"name": "all",
"title": "全部",
"content": {
"datasource": "com.xyst.dinas.statistics.advanquery.FinanceTankSummaryAdvQuery"
}
}
],
"content": {
"isShowView": "table",
"datasource": "com.xyst.dinas.statistics.advanquery.FinanceTankSummaryAdvQuery",
"arguments": {
"items": [
]
},
"actions": [
{
"param": [],
"enable": "ALL",
"name": "query_export",
"action": "query_export",
"title": "导出",
"type": "",
"privage": "com.xyst.dinas.statistics.auth.SaleAnalyseExport"
}
],
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 10,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "区域公司ID",
"key": "regionalCompany",
"columnType": {
"name" : "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "区域公司",
"key": "regionalCompanyName",
"columnType": {
"name" : "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "收款总额(元)",
"key": "CollectionTotal",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "预付款收款总额(元)",
"key": "advanceCollectionTotal",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "保证金收款总额(元)",
"key": "depositCollectionTotal",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "退款总额(元)",
"key": "RefundTotal",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "预付款退款总额(元)",
"key": "advanceRefundTotal",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "保证金退款总额(元)",
"key": "depositRefundTotal",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
]
}
}
}
</view>
</content>
</metadata>
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesProjectAmountTopStatisticsAdvQuery.jmx
......@@ -24,7 +24,7 @@
AND salesRecord.regionalCompany = :?regionalCompany
GROUP BY salesRecord.project
ORDER BY salesRecord.amount DESC
LIMIT :?limitNum
</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