Skip to content

C
cloud-fb
Commit a8d58291 by wukaiqiang
Options

Merge branch 'develop' into feature/sales_record_sync 

# Conflicts:
#	backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesSummaryAdvQuery.jmx
parents 5d7c29de 0e59c54f
Showing with 527 additions and 18 deletions
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/Station.jmx
...@@ -7,21 +7,54 @@ ...@@ -7,21 +7,54 @@
<description>场站管理</description> <description>场站管理</description>
<define>bcp.type.Class</define> <define>bcp.type.Class</define>
<define-version>1.0</define-version> <define-version>1.0</define-version>
<dependency>javax.persistence.Entity</dependency>
<dependency>javax.persistence.Column</dependency>
<dependency>bcp.type.constraint.StringLength</dependency> <dependency>bcp.type.constraint.StringLength</dependency>
<dependency>com.beecode.bap.staff.datamodel.Staff</dependency> <dependency>com.beecode.bap.staff.datamodel.Staff</dependency>
<dependency>javax.persistence.ManyToOne</dependency>
<dependency>javax.persistence.Table</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency> <dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>javax.persistence.JoinColumn</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency> <dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency> <dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency> <dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
<content> <content>
<m:class> <m:class>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Entity</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Table</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>xyst_dinas_biz_station</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:parents> <m:parents>
<m:parent>com.beecode.inz.common.datamodel.BaseInfo</m:parent> <m:parent>com.beecode.inz.common.datamodel.BaseInfo</m:parent>
<m:parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</m:parent> <m:parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</m:parent>
</m:parents> </m:parents>
<m:attributes> <m:attributes>
<m:attribute> <m:attribute>
<m:annotations/> <m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>30</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>stationName</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>454f133a-ec58-46d0-bdc5-2857efac8ee6</m:id> <m:id>454f133a-ec58-46d0-bdc5-2857efac8ee6</m:id>
<m:name>stationName</m:name> <m:name>stationName</m:name>
<m:title>场站名称</m:title> <m:title>场站名称</m:title>
...@@ -30,7 +63,21 @@ ...@@ -30,7 +63,21 @@
<m:default></m:default> <m:default></m:default>
</m:attribute> </m:attribute>
<m:attribute> <m:attribute>
<m:annotations/> <m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>80</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>stationAddress</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>f4427592-4ea6-4c6c-ab0b-834792e0828f</m:id> <m:id>f4427592-4ea6-4c6c-ab0b-834792e0828f</m:id>
<m:name>stationAddress</m:name> <m:name>stationAddress</m:name>
<m:title>场站地址</m:title> <m:title>场站地址</m:title>
...@@ -39,7 +86,24 @@ ...@@ -39,7 +86,24 @@
<m:default></m:default> <m:default></m:default>
</m:attribute> </m:attribute>
<m:attribute> <m:attribute>
<m:annotations/> <m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>regional_company</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>19f58e91-61b8-4a8d-a5e0-d530fdf38cf8</m:id> <m:id>19f58e91-61b8-4a8d-a5e0-d530fdf38cf8</m:id>
<m:name>regionalCompany</m:name> <m:name>regionalCompany</m:name>
<m:title>所属区域公司</m:title> <m:title>所属区域公司</m:title>
...@@ -48,7 +112,17 @@ ...@@ -48,7 +112,17 @@
<m:default></m:default> <m:default></m:default>
</m:attribute> </m:attribute>
<m:attribute> <m:attribute>
<m:annotations/> <m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>station_status</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>c7e790b4-efc8-4cc4-99f1-324ca09579e7</m:id> <m:id>c7e790b4-efc8-4cc4-99f1-324ca09579e7</m:id>
<m:name>stationStatus</m:name> <m:name>stationStatus</m:name>
<m:title>场站状态</m:title> <m:title>场站状态</m:title>
...@@ -57,7 +131,21 @@ ...@@ -57,7 +131,21 @@
<m:default></m:default> <m:default></m:default>
</m:attribute> </m:attribute>
<m:attribute> <m:attribute>
<m:annotations/> <m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>station_coordinate</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>4957fc36-a43a-48d5-b0b2-4c551d677778</m:id> <m:id>4957fc36-a43a-48d5-b0b2-4c551d677778</m:id>
<m:name>stationCoordinate</m:name> <m:name>stationCoordinate</m:name>
<m:title>场站坐标</m:title> <m:title>场站坐标</m:title>
...@@ -67,11 +155,20 @@ ...@@ -67,11 +155,20 @@
</m:attribute> </m:attribute>
<m:attribute> <m:attribute>
<m:annotations> <m:annotations>
<m:annotation> <m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type> <m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value> <m:value>50</m:value>
</m:annotation> </m:annotation>
</m:annotations> <m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>link_man</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>77d699e5-fb54-417c-98c2-9a950a14b662</m:id> <m:id>77d699e5-fb54-417c-98c2-9a950a14b662</m:id>
<m:name>linkMan</m:name> <m:name>linkMan</m:name>
<m:title>联系人</m:title> <m:title>联系人</m:title>
...@@ -80,7 +177,17 @@ ...@@ -80,7 +177,17 @@
<m:default></m:default> <m:default></m:default>
</m:attribute> </m:attribute>
<m:attribute> <m:attribute>
<m:annotations/> <m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>opening_date</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>b4211477-b5b7-4036-9814-7e5affff7ea0</m:id> <m:id>b4211477-b5b7-4036-9814-7e5affff7ea0</m:id>
<m:name>openingDate</m:name> <m:name>openingDate</m:name>
<m:title>开业时间</m:title> <m:title>开业时间</m:title>
...@@ -94,6 +201,15 @@ ...@@ -94,6 +201,15 @@
<m:type>bcp.type.constraint.StringLength</m:type> <m:type>bcp.type.constraint.StringLength</m:type>
<m:value>20</m:value> <m:value>20</m:value>
</m:annotation> </m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>telephone</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations> </m:annotations>
<m:id>f77a03a0-6fdb-43a1-9be9-93c8857aae1c</m:id> <m:id>f77a03a0-6fdb-43a1-9be9-93c8857aae1c</m:id>
<m:name>telephone</m:name> <m:name>telephone</m:name>
...@@ -108,6 +224,15 @@ ...@@ -108,6 +224,15 @@
<m:type>bcp.type.constraint.StringLength</m:type> <m:type>bcp.type.constraint.StringLength</m:type>
<m:value>300</m:value> <m:value>300</m:value>
</m:annotation> </m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>reason</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations> </m:annotations>
<m:id>07df337f-d640-4873-8bd7-e0878d56c187</m:id> <m:id>07df337f-d640-4873-8bd7-e0878d56c187</m:id>
<m:name>reason</m:name> <m:name>reason</m:name>
...@@ -117,7 +242,17 @@ ...@@ -117,7 +242,17 @@
<m:default></m:default> <m:default></m:default>
</m:attribute> </m:attribute>
<m:attribute> <m:attribute>
<m:annotations></m:annotations> <m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>sort_order</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>bd60d3ff-9308-4f15-aa1e-67d2923192f2</m:id> <m:id>bd60d3ff-9308-4f15-aa1e-67d2923192f2</m:id>
<m:name>sortOrder</m:name> <m:name>sortOrder</m:name>
<m:title>排序</m:title> <m:title>排序</m:title>
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/NeedPlanDaoImpl.java
...@@ -66,7 +66,7 @@ public class NeedPlanDaoImpl implements NeedPlanDao, NeedPlanConstant { ...@@ -66,7 +66,7 @@ public class NeedPlanDaoImpl implements NeedPlanDao, NeedPlanConstant {
@Override @Override
public List<UUID> queryNeedPlanContratByCycleId(UUID planningCycleId) { public List<UUID> queryNeedPlanContratByCycleId(UUID planningCycleId) {
List<UUID> list = new ArrayList<>(); List<UUID> list = new ArrayList<>();
String sql = " SELECT DISTINCT contract FROM xyst_dinas_sales_need_plan WHERE HEX(planning_cycle) =:planningCycleId "; String sql = " SELECT DISTINCT contract FROM xyst_dinas_sales_need_plan WHERE HEX(planning_cycle) =:planningCycleId and (discard is null or discard = 0) ";
return template.execute(new HibernateCallback<List<UUID>>() { return template.execute(new HibernateCallback<List<UUID>>() {
@Override @Override
public List<UUID> doInHibernate(Session session) throws HibernateException { public List<UUID> doInHibernate(Session session) throws HibernateException {
......
backend/xyst.dinas.statistics/src/main/model/com/xyst/dinas/statistics/auth/AdvanceAnalyseExport.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.statistics.auth</package>
<name>AdvanceAnalyseExport</name>
<title>导出</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='2b2e3451-fa6f-45ff-aee7-2a31137c6979' category='报表/预付款及结余汇总（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.statistics/src/main/resources/OperationsDailyReportsQueryView.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>dca832fd-dfd8-4195-b0ed-8f5ff2ba1faa</id>
<name>com.xyst.dinas.statistics.advanquery.PaymentDetailsQueryView</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.OperationsDailyReportsAdvQuery"
}
}
],
"content": {
"isShowView": "table",
"datasource": "com.xyst.dinas.statistics.advanquery.OperationsDailyReportsAdvQuery",
"arguments": {
"items": [
]
},
"actions": [
{
"param": [],
"enable": "ALL",
"name": "query_export",
"action": "query_export",
"title": "导出",
"type": "",
"privage": "com.xyst.dinas.statistics.auth.MarketBillExport"
}
],
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 200,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "id",
"key": "id",
"columnType": {
"name" : "inner",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "场站",
"key": "stationName",
"columnType": {
"name" : "inner",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "砂石类型",
"key": "dinasTypeName",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "销量",
"key": "saleDealAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "销售额",
"key": "saleAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
]
}
}
}
</view>
</content>
</metadata>
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsQueryView.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>dca832fd-dfd8-4195-b0ed-8f5ff2ba1faa</id>
<name>com.xyst.dinas.statistics.advanquery.OperationsDailyReportsQueryView</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.OperationsDailyReportsAdvQuery"
}
}
],
"content": {
"isShowView": "table",
"datasource": "com.xyst.dinas.statistics.advanquery.OperationsDailyReportsAdvQuery",
"arguments": {
"items": [
]
},
"actions": [
{
"param": [],
"enable": "ALL",
"name": "query_export",
"action": "query_export",
"title": "导出",
"type": "",
"privage": "com.xyst.dinas.statistics.auth.MarketBillExport"
}
],
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 200,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "id",
"key": "id",
"columnType": {
"name" : "inner",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "场站",
"key": "stationName",
"columnType": {
"name" : "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "砂石类型",
"key": "dinasTypeName",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "销量",
"key": "saleDealAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "销售额",
"key": "saleAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
]
}
}
}
</view>
</content>
</metadata>
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsQueryView.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>92341954-ad99-43a8-9ab0-cdd61d268888</id>
<name>com.xyst.dinas.statistics.advanquery.OperationsOtherReportsQueryView</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.OperationsOtherReportsAdvQuery"
}
}
],
"content": {
"isShowView": "table",
"datasource": "com.xyst.dinas.statistics.advanquery.OperationsOtherReportsAdvQuery",
"arguments": {
"items": [
]
},
"actions": [
{
"param": [],
"enable": "ALL",
"name": "query_export",
"action": "query_export",
"title": "导出",
"type": "",
"privage": "com.xyst.dinas.statistics.auth.MarketBillExport"
}
],
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 200,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "id",
"key": "id",
"columnType": {
"name" : "inner",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "场站",
"key": "stationName",
"columnType": {
"name" : "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "砂石类型",
"key": "dinasTypeName",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "销量",
"key": "saleDealAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "销售额",
"key": "saleAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
]
}
}
}
</view>
</content>
</metadata>
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesSummaryAdvQuery.jmx
...@@ -296,7 +296,7 @@ SELECT ...@@ -296,7 +296,7 @@ SELECT
dinasType.dinasTypeName as dinasType, dinasType.dinasTypeName as dinasType,
SUM(salesSummary.saleDealAmount) as saleDealAmount, SUM(salesSummary.saleDealAmount) as saleDealAmount,
SUM(salesSummary.saleAmount) as saleAmount, SUM(salesSummary.saleAmount) as saleAmount,
( SUM(salesSummary.saleAmount) / SUM(salesSummary.saleDealAmount) ) as avgAmount, (SUM(salesSummary.saleAmount) / SUM(salesSummary.saleDealAmount)) as avgAmount,
( (
SELECT SELECT
SUM( SalesSummary1.saleAmount ) AS janAmount SUM( SalesSummary1.saleAmount ) AS janAmount
...@@ -448,7 +448,7 @@ FROM ...@@ -448,7 +448,7 @@ FROM
WHERE salesSummary.deal_year = :?year WHERE salesSummary.deal_year = :?year
AND salesSummary.station IN ( :?stationList ) AND salesSummary.station IN ( :?stationList )
GROUP BY station,dinasType GROUP BY station,dinasType
ORDER BY ORDER BY
station,saleDealAmount DESC station,saleDealAmount DESC
</sql> </sql>
</template> </template>
......
backend/xyst.dinas.statistics/src/main/resources/config/AdvancePaymentAndBalanceSummary.hbm.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<class entity-name="com.xyst.dinas.statistics.datamodel.AdvancePaymentAndBalanceSummary" table="xyst_dinas_statistics_advancepayment_Balance_summary" optimistic-lock="version"> <class entity-name="com.xyst.dinas.statistics.datamodel.AdvancePaymentAndBalanceSummary" table="xyst_dinas_statistics_advancepayment_Balance_summary" optimistic-lock="version">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/> <tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<id name="id" type="uuid-binary" column="id" length="16"> <id name="id" type="uuid-binary" column="id" length="16">
<generator class="uuid2"/> <generator class="assigned" />
</id> </id>
<many-to-one name="project" entity-name="com.xyst.dinas.project.datamodel.ProjectFiled" fetch="select"> <many-to-one name="project" entity-name="com.xyst.dinas.project.datamodel.ProjectFiled" fetch="select">
<column name="project_id" not-null="false"/> <column name="project_id" not-null="false"/>
......
backend/xyst.dinas.statistics/src/main/resources/config/SalesSummary.hbm.xml
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<class entity-name="com.xyst.dinas.statistics.datamodel.SalesSummary" table="xyst_dinas_statistics_sale_summary" optimistic-lock="version"> <class entity-name="com.xyst.dinas.statistics.datamodel.SalesSummary" table="xyst_dinas_statistics_sale_summary" optimistic-lock="version">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/> <tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<id name="id" type="uuid-binary" column="id" length="16"> <id name="id" type="uuid-binary" column="id" length="16">
<generator class="uuid2" /> <generator class="assigned" />
</id> </id>
<many-to-one name="project" entity-name="com.xyst.dinas.project.datamodel.ProjectFiled" fetch="select"> <many-to-one name="project" entity-name="com.xyst.dinas.project.datamodel.ProjectFiled" fetch="select">
<column name="project_id" not-null="false"/> <column name="project_id" not-null="false"/>
</many-to-one> </many-to-one>
......
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