Merge branch 'feature/form_statistics_05' into 'develop'

区域公司销售量统计（明细）

See merge request kunlun/xyst_dinas/xyst_dinas_backend!55

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDealAmountStatisticsAdvQuery.jmx

+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
+	<specification>1.0</specification>
+	<id>82351262-5bc6-4394-aa60-30fe63574218</id>
+	<name>com.xyst.dinas.statistics.advanquery.SalesDealAmountStatisticsAdvQuery</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,
+				salesRecord.dinasType AS dinasType,
+				salesRecord.regionalCompany AS regionalCompany ,
+				dinasType.dinasTypeName AS dinasTypeName,
+				xystOrganization.name AS regionalCompanyName
+			FROM
+				SalesRecord AS salesRecord 
+				LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id
+				LEFT JOIN xystOrganization AS xystOrganization on xystOrganization.id = salesRecord.regionalCompany
+			WHERE 1=1
+				AND salesRecord.syncTime &gt;= :?startDate
+				AND salesRecord.syncTime &lt;= :?endDate
+			GROUP BY
+				salesRecord.dinasType ,
+				salesRecord.regionalCompany
+			</sql>
+		</template>
+	</content>
+</metadata>
\ No newline at end of file

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDealAmountStatisticsQueryView.jmx

+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
+	<specification>1.0</specification>
+	<id>8dcebb8d-466a-4070-b600-c8c71572267b</id>
+	<name>com.xyst.dinas.statistics.advanquery.SalesDealAmountStatisticsQueryView</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.SalesDealAmountStatisticsAdvQuery"
+                        }
+                    }
+                ],
+                "content": {
+                    "isShowView": "table",
+                    "datasource": "com.xyst.dinas.statistics.advanquery.SalesDealAmountStatisticsAdvQuery",
+                    "arguments": {
+                        "items": [
+                        ]
+                    },
+                     "actions": [
+                      
+                    ],
+                    "table": {
+                        "selectType": "MULTI",
+                        "serialNumber": "series",
+                        "pageSize": 10,
+                        "orders":[
+                           
+                        ],
+                        "expand": false,
+                        "columns": [
+                            
+                            {
+                                "type": "VALUE",
+                                "title": "区域公司",
+                                "key": "regionalCompanyName",
+                                "columnType": {
+                                    "name": "select",
+                                    "data": {
+                                        "selected": true
+                                    }
+                                }
+                            },
+                            {
+                                "type": "VALUE",
+                                "title": "砂石类型",
+                                "key": "dinasTypeName",
+                                "columnType": {
+                                    "name": "select",
+                                    "data": {
+                                        "selected": true
+                                    }
+                                }
+                            },
+                            {
+                                "type": "VALUE",
+                                "title": "销量",
+                                "key": "dealAmount",
+                                "columnType": {
+                                    "name": "select",
+                                    "data": {
+                                        "selected": true
+                                    }
+                                }
+                            },
+                            {
+                                "type": "VALUE",
+                                "title": "区域公司ID",
+                                "key": "regionalCompany",
+                                "columnType": {
+                                    "name": "select",
+                                    "data": {
+                                        "selected": true
+                                    }
+                                }
+                            },
+                            {
+                                "type": "VALUE",
+                                "title": "砂石类型ID",
+                                "key": "dinasType",
+                                "columnType": {
+                                    "name": "select",
+                                    "data": {
+                                        "selected": true
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                   }
+            }
+		</view>
+	</content>
+</metadata>