From 8d0009c7b03ea915955bf6b84a548699a32f23e5 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 三月 2025 17:59:56 +0800
Subject: [PATCH] feat: 账单及查询、新增、添加营运部门ID

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 be019f9..81ad5e9 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
@@ -4,12 +4,14 @@
 import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.dto.*;
 import com.ruoyi.system.model.TBill;
 import com.ruoyi.system.model.TBillConfirm;
 import com.ruoyi.system.model.TBillDetail;
 import com.ruoyi.system.query.TBillQuery;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.TBillConfirmService;
 import com.ruoyi.system.service.TBillDetailService;
 import com.ruoyi.system.service.TBillService;
@@ -49,6 +51,7 @@
     @PostMapping("list")
     @ApiOperation("分页查询账单列表")
     public R<PageInfo<TBillDto>> list(@RequestBody TBillQuery query){
+        query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
         PageInfo<TBillDto> pageInfo = tBillService.queryPage(query);
         return R.ok(pageInfo);
     }
@@ -57,6 +60,7 @@
     @PostMapping("add")
     @ApiOperation("新增账单")
     public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
+        bill.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
         tBillService.saveBill(bill);
         return R.ok();
     }
@@ -116,10 +120,16 @@
     @PostMapping("cashPay")
     public R cashPay(@RequestBody CachPayDto cachPayDto){
         tBillService.cashPay(cachPayDto);
-        return null;
+        return R.ok();
     }
 
 
+    @ApiOperation("统计")
+    @GetMapping("statistics")
+    public R<BillStatisticsDto> statistics(){
+        BillStatisticsDto dto = tBillService.statistics(SecurityUtils.getBusinessDeptId());
+        return R.ok(dto);
+    }
 
 
 

--
Gitblit v1.7.1