From d66b806d685672f2f817986e89f69fb09d130f11 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 09 四月 2025 18:02:32 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
index de6f98f..7077198 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -32,6 +32,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
@@ -69,6 +71,14 @@
return R.ok(pageInfo);
}
+ @ApiOperation("统计")
+ @PostMapping("statistics")
+ public R<BillStatisticsDto> statistics(@RequestBody TBillQuery query){
+ query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
+ BillStatisticsDto dto = tBillService.statistics(query);
+ return R.ok(dto);
+ }
+
@ApiOperation(value = "获取合同分页列表")
@PostMapping(value = "/contractList")
@@ -90,6 +100,22 @@
}
bill.setBusinessDeptId(businessDeptId);
tBillService.saveBill(bill);
+ return R.ok();
+ }
+
+
+ @PreAuthorize("@ss.hasPermi('bill:list:editAmount')")
+ @PostMapping("editAmount")
+ @ApiOperation("修改账单金额")
+ public R editAmount(@Validated @RequestBody TbillSaveDto bill){
+ if (StringUtils.isEmpty(bill.getId())){
+ return R.fail("参数错误");
+ }
+ if (bill.getEditAmount().compareTo(BigDecimal.ZERO)==0){
+ return R.fail("调整金额不能为0");
+ }
+
+ tBillService.editAmount(bill);
return R.ok();
}
@@ -152,12 +178,7 @@
}
- @ApiOperation("统计")
- @GetMapping("statistics")
- public R<BillStatisticsDto> statistics(){
- BillStatisticsDto dto = tBillService.statistics(SecurityUtils.getBusinessDeptId());
- return R.ok(dto);
- }
+
--
Gitblit v1.7.1