From 6ff86d171b7621b4200d2e25176e08c171bd3809 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 07 九月 2024 17:51:22 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index b272feb..92990e1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -16,6 +16,7 @@
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
import com.ruoyi.order.api.query.SettlementListQuery;
+import com.ruoyi.order.api.vo.SettlementTotalVO;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.order.api.vo.ChargingOrderTimeVO;
import com.ruoyi.order.api.model.ChargingListQuery;
@@ -63,10 +64,16 @@
}
@GetMapping(value = "/settlementTotal")
- @ApiOperation(value = "结算确认表-列表查询", tags = {"管理后台-财务结算"})
- @ApiParam(name = "time", value = "汇报时间yyyy-MM")
- public AjaxResult<ChargingOrderListInfoVO> settlementTotal(String time) {
- return AjaxResult.success(null);
+ @ApiOperation(value = "结算汇总-列表查询", tags = {"管理后台-财务结算"})
+ @ApiParam(name = "time", value = "汇报时间2024-01-01 00:00:00")
+ public AjaxResult<SettlementTotalVO> settlementTotal(String time) {
+ SettlementTotalVO res = chargingOrderService.settlementTotal(time);
+ return AjaxResult.success(res);
+ }
+ @GetMapping(value = "/settlementTotalR")
+ public R<SettlementTotalVO> settlementTotalR( String time) {
+ SettlementTotalVO res = chargingOrderService.settlementTotal(time);
+ return R.ok(res);
}
@PostMapping(value = "/settlementAdd")
@ApiOperation(value = "结算确认表-生成/保存结算确认表", tags = {"管理后台-财务结算"})
--
Gitblit v1.7.1