From 8a4d2b27e05d55be74dfdb870650a6b0f8cd9b45 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 10 二月 2025 13:48:39 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
index 60847f1..386fce2 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -3,15 +3,12 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.query.TBillQuery;
-import com.ruoyi.system.query.TTenantQuery;
import com.ruoyi.system.service.TBillService;
-import com.ruoyi.system.vo.TBillVO;
-import com.ruoyi.system.vo.TenantVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,27 +22,21 @@
* @author xiaochen
* @since 2025-01-17
*/
-@Api(tags = "租金账单管理")
@RestController
@RequestMapping("/t-bill")
public class TBillController {
- private final TBillService billService;
-
@Autowired
- public TBillController(TBillService billService) {
- this.billService = billService;
- }
+ TBillService tBillService;
- /**
- * 获取账单列表
- */
- @ApiOperation(value = "获取账单列表")
- @PostMapping(value = "/pageList")
- public R<PageInfo<TBillVO>> pageList(@RequestBody TBillQuery query) {
- return R.ok(billService.pageList(query));
+ @PostMapping("list")
+ public R<PageInfo<TBillDto>> list(@RequestBody TBillQuery query){
+ if (StringUtils.isEmpty(query.getUserId())){
+ throw new ServiceException("用户ID不能为空");
+ }
+ PageInfo<TBillDto> pageInfo = tBillService.queryPage(query);
+ return R.ok(pageInfo);
}
-
}
--
Gitblit v1.7.1