Skip to content

C
cloud-fb
Commit dbe21a4b by 焦凯
Options

Merge branch 'feature/sales_record_sync' into 'develop' 

解决VIEW中ID报错，修改修改统一JMX中SQL格式

See merge request kunlun/xyst_dinas/xyst_dinas_backend!22
parents e7a700aa 2fb64756
Showing with 10 additions and 57 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/AdvancePaymentBalanceSumQueryView.jmx
......@@ -50,23 +50,12 @@
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 200,
"pageSize": 10,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "id",
"key": "id",
"columnType": {
"name" : "inner",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "购砂单位",
......@@ -125,7 +114,7 @@
{
"type": "VALUE",
"title": "本年累计退费",
"key": "fundAmount",
"key": "refundAmount",
"columnType": {
"name": "select",
"data": {
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsQueryView.jmx
......@@ -50,23 +50,12 @@
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 200,
"pageSize": 10,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "id",
"key": "id",
"columnType": {
"name" : "inner",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "场站",
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsQueryView.jmx
......@@ -50,23 +50,12 @@
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 200,
"pageSize": 10,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "id",
"key": "id",
"columnType": {
"name" : "inner",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "场站",
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/PaymentDetailsAdvQuery.jmx
......@@ -36,13 +36,12 @@
financeRefund.refundExplain AS remark ,
financeRefund.regionalCompany AS regionalCompanyId,
purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
projectFiled.projectName AS projectName,
CASE WHEN financeRefund.fundType = 1 THEN 'DEPOSIT' ELSE 'ADVANCE' END AS fundType1
FROM
FinanceRefund AS financeRefund
LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = financeRefund.purchaseSandCompany
LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = financeRefund.project
UNION ALL
UNION ALL
SELECT
artificialRecharge.id AS id,
artificialRecharge.createTime AS createTime,
......@@ -58,13 +57,11 @@
artificialRecharge.remark AS remark ,
artificialRecharge.regionalCompany AS regionalCompanyId,
purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
projectFiled.projectName AS projectName,
artificialRecharge.fundType AS fundType1
FROM
ArtificialRecharge AS artificialRecharge
LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = artificialRecharge.purchaseSandUnit
LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = artificialRecharge.project
UNION ALL
LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = artificialRecharge.project UNION ALL
SELECT
expenseAdjust.id AS id,
expenseAdjust.createTime AS createTime,
......@@ -89,7 +86,6 @@
expenseAdjust.remark AS remark,
expenseAdjust.regionalCompany AS regionalCompanyId,
purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
projectFiled.projectName AS projectName,
expenseAdjust.fundType AS fundType1
FROM
ExpenseAdjust AS expenseAdjust
......@@ -99,10 +95,10 @@
WHERE result.regionalCompanyId = :?regionalCompanyId
AND ( result.createTime >= :?startDate AND result.createTime <= :?endDate )
AND result.purchaseSandCompanyonName LIKE :?purchaseSandCompanyonName
AND result.projectName LIKE :?projectName
AND result.project LIKE :?projectName
AND result.fundType1 = :?fundType
ORDER BY result.createTime DESC
</sql>
</template>
</content>
</metadata>
</metadata>
\ No newline at end of file
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesSummaryQueryView.jmx
......@@ -50,23 +50,12 @@
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 200,
"pageSize": 10,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "id",
"key": "id",
"columnType": {
"name" : "inner",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "场站",
......
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