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