Skip to content

C
cloud-fb
Commit c22b08c1 by shiwenbo
Options

Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

parents 4364fab2 770cb242
Showing with 8 additions and 154 deletions
backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/web/SalesSummaryController.java
......@@ -12,28 +12,26 @@ import com.xyst.dinas.sales.web.info.SalesRecordInfo;
import com.xyst.dinas.statistics.service.AdvancePaymentBalanceSumService;
import com.xyst.dinas.statistics.service.SalesSummaryService;
@RestController
public class SalesSummaryController {
@Autowired
SalesSummaryService salesSummaryService;
@Autowired
AdvancePaymentBalanceSumService advancePaymentBalanceSumService;
@PostMapping(value = "/SalesSummary/save", consumes = "application/json")
@PostMapping(value = "/SalesSummary/save", consumes = "application/json")
public Object saveSalesSummary(@RequestBody List<SalesRecordInfo>
salesRecordList) {
/* if (salesRecordList.isEmpty()) { return
ResponseObj.error("传递的销售台账数据条数为0！请确认！"); } else { return
salesSummaryService.generateAllSalesRecordByDate("2021-05-08", "2021-05-07"); }
salesSummaryService.generateAllSalesRecordByDate("2021-05-08", "2021-01-01"); }
}*/
if (salesRecordList.isEmpty()) { return
ResponseObj.error("传递的销售台账数据条数为0！请确认！"); } else { return
advancePaymentBalanceSumService.generateAdvancePaymentBalanceSumByDate("2021-05-08", "2021-05-07"); }
}
ResponseObj.error("传递的销售台账数据条数为0！请确认！"); } else { return
advancePaymentBalanceSumService.generateAdvancePaymentBalanceSumByDate(
"2021-05-08", "2021-05-07"); } }
}
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/statisticsquery/PaymentDetailsQueryView.jmx deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>e22370f8-8226-4711-a996-764db3360dff</id>
<name>com.xyst.dinas.statistics.statisticsquery.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.statisticsquery.PaymentDetailsAdvQuery"
}
}
],
"content": {
"isShowView": "table",
"datasource": "com.xyst.dinas.statistics.statisticsquery.PaymentDetailsAdvQuery",
"arguments": {
"items": [
]
},
"actions": [
],
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 10,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "id",
"key": "id",
"columnType": {
"name" : "inner",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "时间",
"key": "createTime",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "购砂单位",
"key": "purchaseSandUnit",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "项目名称",
"key": "project",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "资金类型",
"key": "fundType",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "收款金额",
"key": "rechargeAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "退款金额",
"key": "actualRefundAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "备注",
"key": "remark",
"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