Skip to content

C
cloud-fb
Commit d6feb497 by wukaiqiang
Options

修改砂石销量趋势图

parent d79ee868
Showing with 343 additions and 27 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendDayStatisticsAdvQuery.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>707863e9-1b95-4d13-ab2a-f302ed3bdab3</id>
<name>com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendDayStatisticsAdvQuery</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
SUM(salesRecord.dealAmount) AS dealAmount,
dinasType.dinasTypeName AS dinasTypeName,
salesRecord.dinasType AS dinasType,
yearof(salesRecord.dealTime) AS year,
monthof(salesRecord.dealTime) AS month,
dayof(salesRecord.dealTime) AS day
FROM
SalesRecord AS salesRecord
LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id
WHERE 1=1
AND salesRecord.syncTime &gt;= :?startDate
AND salesRecord.syncTime &lt;= :?endDate
AND salesRecord.regionalCompany = :?regionalCompany
group by yearof(salesRecord.dealTime) , monthof(salesRecord.dealTime),dayof(salesRecord.dealTime)
</sql>
</template>
</content>
</metadata>
\ No newline at end of file
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendDayStatisticsQueryView.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>e72dad79-e688-465f-b653-66e68182dc23</id>
<name>com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendDayStatisticsQueryView</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.SalesDinasTypeDealAmountTrendDayStatisticsAdvQuery"
}
}
],
"content": {
"isShowView": "table",
"datasource": "com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendDayStatisticsAdvQuery",
"arguments": {
"items": [
]
},
"actions": [
],
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 10,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "销售量",
"key": "dealAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "砂石类型",
"key": "dinasTypeName",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "砂石类型ID",
"key": "dinasType",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
,
{
"type": "VALUE",
"title": "年",
"key": "year",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
,
{
"type": "VALUE",
"title": "月",
"key": "month",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
,
{
"type": "VALUE",
"title": "日",
"key": "day",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
]
}
}
}
</view>
</content>
</metadata>
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendMonthStatisticsAdvQuery.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>4e8b220c-eb3b-458a-8500-8edc1494b3b1</id>
<name>com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendMonthStatisticsAdvQuery</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
SUM(salesRecord.dealAmount) AS dealAmount,
dinasType.dinasTypeName AS dinasTypeName,
salesRecord.dinasType AS dinasType,
yearof(salesRecord.dealTime) AS year,
monthof(salesRecord.dealTime) AS month
FROM
SalesRecord AS salesRecord
LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id
WHERE 1=1
AND salesRecord.syncTime &gt;= :?startDate
AND salesRecord.syncTime &lt;= :?endDate
AND salesRecord.regionalCompany = :?regionalCompany
group by yearof(salesRecord.dealTime) , monthof(salesRecord.dealTime)
</sql>
</template>
</content>
</metadata>
\ No newline at end of file
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendMonthStatisticsQueryView.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>cb43e731-3e96-4803-b854-3bd73df9f9ea</id>
<name>com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendMonthStatisticsQueryView</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.SalesDinasTypeDealAmountTrendMonthStatisticsAdvQuery"
}
}
],
"content": {
"isShowView": "table",
"datasource": "com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendMonthStatisticsAdvQuery",
"arguments": {
"items": [
]
},
"actions": [
],
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 10,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "销售量",
"key": "dealAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "砂石类型",
"key": "dinasTypeName",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "砂石类型ID",
"key": "dinasType",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
,
{
"type": "VALUE",
"title": "年",
"key": "year",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
,
{
"type": "VALUE",
"title": "月",
"key": "month",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
]
}
}
}
</view>
</content>
</metadata>
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendStatisticsAdvQuery.jmx → backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendYearStatisticsAdvQuery.jmx
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata"> <metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification> <specification>1.0</specification>
<id>a4850840-10a2-410a-a5b5-bf5b17755551</id> <id>d6e83927-ae01-4da2-a85d-001dfa5c304a</id>
<name>com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendStatisticsAdvQuery</name> <name>com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendYearStatisticsAdvQuery</name>
<title>砂石销量趋势</title> <title>砂石销量趋势(年)</title>
<description>砂石销量趋势</description> <description>砂石销量趋势(年)</description>
<define>advanced.query.template</define> <define>advanced.query.template</define>
<define-version>1.0</define-version> <define-version>1.0</define-version>
<content> <content>
...@@ -12,14 +12,19 @@ ...@@ -12,14 +12,19 @@
<sql-type>SQL</sql-type> <sql-type>SQL</sql-type>
<sql> <sql>
SELECT SELECT
salesRecord.dealAmount, SUM(salesRecord.dealAmount) AS dealAmount,
dinasType.dinasTypeName, dinasType.dinasTypeName AS dinasTypeName,
salesRecord.dinasType salesRecord.dinasType AS dinasType,
yearof(salesRecord.dealTime) AS year
FROM FROM
salesRecord AS salesRecord SalesRecord AS salesRecord
LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id
WHERE 1=1
AND salesRecord.syncTime &gt;= :?startDate
AND salesRecord.syncTime &lt;= :?endDate
AND salesRecord.regionalCompany = :?regionalCompany
group by yearof(salesRecord.dealTime)
</sql> </sql>
</template> </template>
</content> </content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendStatisticsQueryView.jmx → backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendYearStatisticsQueryView.jmx
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata"> <metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification> <specification>1.0</specification>
<id>2de6d7ec-3176-4fd0-8773-6e383793a06e</id> <id>aa9f6f84-c8a6-4792-b14e-505cd0913170</id>
<name>com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendStatisticsAdvQuery</name> <name>com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendYearStatisticsQueryView</name>
<title>砂石销量趋势</title> <title>砂石销量趋势(年)</title>
<description>砂石销量趋势</description> <description>砂石销量趋势(年)</description>
<define>advanced.query.view</define> <define>advanced.query.view</define>
<define-version>1.0</define-version> <define-version>1.0</define-version>
<content> <content>
<view> <view>
{ {
"name": "砂石销量趋势", "name": "砂石销量趋势(年)",
"title": "砂石销量趋势", "title": "砂石销量趋势(年)",
"description": "砂石销量趋势", "description": "砂石销量趋势(年)",
"actions": [], "actions": [],
"scenes" : { "scenes" : {
"isShowScenes" : true "isShowScenes" : true
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
"name": "all", "name": "all",
"title": "全部", "title": "全部",
"content": { "content": {
"datasource": "com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendStatisticsAdvQuery" "datasource": "com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendYearStatisticsAdvQuery"
} }
} }
], ],
"content": { "content": {
"isShowView": "table", "isShowView": "table",
"datasource": "com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendStatisticsAdvQuery", "datasource": "com.xyst.dinas.statistics.advanquery.SalesDinasTypeDealAmountTrendYearStatisticsAdvQuery",
"arguments": { "arguments": {
"items": [ "items": [
] ]
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
{ {
"type": "VALUE", "type": "VALUE",
"title": "砂石种类名称", "title": "销售量",
"key": "dinasTypeName", "key": "dealAmount",
"columnType": { "columnType": {
"name": "select", "name": "select",
"data": { "data": {
...@@ -62,8 +62,8 @@ ...@@ -62,8 +62,8 @@
}, },
{ {
"type": "VALUE", "type": "VALUE",
"title": "销售数量", "title": "砂石类型",
"key": "dealAmount", "key": "dinasTypeName",
"columnType": { "columnType": {
"name": "select", "name": "select",
"data": { "data": {
...@@ -73,19 +73,20 @@ ...@@ -73,19 +73,20 @@
}, },
{ {
"type": "VALUE", "type": "VALUE",
"title": "销售额", "title": "砂石类型ID",
"key": "amount", "key": "dinasType",
"columnType": { "columnType": {
"name": "select", "name": "select",
"data": { "data": {
"selected": true "selected": true
} }
} }
}, }
,
{ {
"type": "VALUE", "type": "VALUE",
"title": "砂石类型", "title": "年",
"key": "dinasType", "key": "year",
"columnType": { "columnType": {
"name": "select", "name": "select",
"data": { "data": {
...@@ -93,6 +94,7 @@ ...@@ -93,6 +94,7 @@
} }
} }
} }
] ]
} }
} }
......
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