From 389765d368544c8a811a6d1c23f45cbfb40753c1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 10 十月 2024 10:23:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
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 efb4d7f..62bd3c0 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
@@ -82,8 +82,7 @@
}
@ApiOperation(value = "充电时段统计-导出", tags = {"管理后台-财务结算"})
@PutMapping("/export")
- public void export(@RequestBody ChargingListQuery dto)
- {
+ public void export(@RequestBody ChargingListQuery dto) {
ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>();
List<ChargingOrderListVO> exportList = res.getExportList();
@@ -118,13 +117,15 @@
}
@GetMapping(value = "/settlementTotal")
@ApiOperation(value = "结算汇总-列表查询", tags = {"管理后台-财务结算"})
- @ApiParam(name = "time", value = "汇报时间2024-01-01 00:00:00")
+ @ApiParam(name = "time", value = "汇报时间2024-01")
public AjaxResult<SettlementTotalVO> settlementTotal(String time) {
+ time = time+"-01 00:00:00";
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return AjaxResult.success(res);
}
@GetMapping(value = "/settlementTotalR")
- public R<SettlementTotalVO> settlementTotalR( String time) {
+ public R<SettlementTotalVO> settlementTotalR(String time) {
+ time = time+"-01 00:00:00";
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return R.ok(res);
}
@@ -140,6 +141,12 @@
PageInfo<TSettlementConfirm> res = chargingOrderService.settlementList(dto);
return R.ok(res);
}
+ @GetMapping(value = "/deleteSettlement")
+ @ApiOperation(value = "结算表记录-删除", tags = {"管理后台-财务结算"})
+ public R deleteSettlement(String uid) {
+ tSettlementConfirmService.removeById(uid);
+ return R.ok();
+ }
@GetMapping(value = "/downloadSettlement/{uid}")
public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid) {
TSettlementConfirm byId = tSettlementConfirmService.getById(uid);
--
Gitblit v1.7.1