Commit 89375ed0 by 杨清松

经营报表

parent b8660ca6
......@@ -66,7 +66,7 @@ public class NeedPlanDaoImpl implements NeedPlanDao, NeedPlanConstant {
@Override
public List<UUID> queryNeedPlanContratByCycleId(UUID planningCycleId) {
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>>() {
@Override
public List<UUID> doInHibernate(Session session) throws HibernateException {
......
<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
<?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>
<?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>
<?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>
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