From dbf671285d9217f6ca84ee1e795aa9af386955e3 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 03 四月 2025 21:06:02 +0800
Subject: [PATCH] 1.租户数量趋势统计
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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 2dbbbdd..c0b0f63 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,15 +4,16 @@
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.model.TContract;
import com.ruoyi.system.query.TBillQuery;
-import com.ruoyi.system.service.TBillConfirmService;
-import com.ruoyi.system.service.TBillDetailService;
-import com.ruoyi.system.service.TBillService;
+import com.ruoyi.system.query.TContractQuery;
+import com.ruoyi.system.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,18 +46,31 @@
@Autowired
TBillConfirmService tBillConfirmService;
- @PreAuthorize("@ss.hasPermi('system:bill:list')")
+ @Autowired
+ TContractService contractService;
+
+ @PreAuthorize("@ss.hasPermi('bill:list')")
@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);
}
- @PreAuthorize("@ss.hasPermi('system:bill:add')")
+
+ @ApiOperation(value = "获取合同分页列表")
+ @PostMapping(value = "/contractList")
+ public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
+ query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
+ return R.ok(contractService.queryPage(query));
+ }
+
+ @PreAuthorize("@ss.hasPermi('bill:list:addRent')")
@PostMapping("add")
@ApiOperation("新增账单")
public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
+ bill.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
tBillService.saveBill(bill);
return R.ok();
}
@@ -83,7 +97,7 @@
}
- @PreAuthorize("@ss.hasPermi('system:bill:checkOfflinePay')")
+ @PreAuthorize("@ss.hasPermi('bill:list:paid')")
@ApiOperation("确认线下缴费")
@PostMapping("checkOfflinePay")
public R checkOfflinePay(@Validated @RequestBody OfflinePayCheckDto dto){
@@ -91,7 +105,7 @@
return R.ok();
}
- @PreAuthorize("@ss.hasPermi('system:bill:sendSmsByBillIds')")
+ @PreAuthorize("@ss.hasPermi('bill:list:sendMsg')")
@ApiOperation("账单批量发送短信通知")
@PostMapping("sendSmsByBillIds")
public R sendSmsByBillIds(@Validated @RequestBody SmsByBillDto dto){
@@ -100,8 +114,8 @@
}
- @PreAuthorize("@ss.hasPermi('system:bill:sendMailBatchByBillIds')")
- @ApiOperation("账单批量发送邮件通知")
+ @PreAuthorize("@ss.hasPermi('bill:list:sendMail')")
+ @ApiOperation("账单批量发送邮箱通知")
@PostMapping("sendMailBatchByBillIds")
public R sendMailBatchByBillIds(@Validated @RequestBody SmsByBillDto dto){
Integer failNum = tBillService.sendMailBatchByBillIds(dto);
@@ -111,7 +125,7 @@
- @PreAuthorize("@ss.hasPermi('system:bill:cashPay')")
+ @PreAuthorize("@ss.hasPermi('bill:list:receipt')")
@ApiOperation("收款")
@PostMapping("cashPay")
public R cashPay(@RequestBody CachPayDto cachPayDto){
@@ -123,11 +137,9 @@
@ApiOperation("统计")
@GetMapping("statistics")
public R<BillStatisticsDto> statistics(){
- BillStatisticsDto dto = tBillService.statistics();
+ BillStatisticsDto dto = tBillService.statistics(SecurityUtils.getBusinessDeptId());
return R.ok(dto);
}
-
-
--
Gitblit v1.7.1