From a793cb441bb816a73d987554866b531f7c97082f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 10 二月 2025 11:54:20 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/TBillVO.java | 10 +++++
ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java | 15 +++++++
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 32 ++++++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 7 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java | 10 +++++
5 files changed, 74 insertions(+), 0 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 dba1a39..60847f1 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
@@ -1,6 +1,19 @@
package com.ruoyi.web.controller.api;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+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;
import org.springframework.web.bind.annotation.RestController;
@@ -12,9 +25,28 @@
* @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;
+ }
+
+ /**
+ * 获取账单列表
+ */
+ @ApiOperation(value = "获取账单列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<TBillVO>> pageList(@RequestBody TBillQuery query) {
+ return R.ok(billService.pageList(query));
+ }
+
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java
new file mode 100644
index 0000000..b6302c6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java
@@ -0,0 +1,15 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "账单查询对象query")
+public class TBillQuery extends BasePage {
+
+ @ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期 5=已失效")
+ private String payFeesStatus;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
index cdf84dd..427e596 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
@@ -1,7 +1,10 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.query.TBillQuery;
+import com.ruoyi.system.vo.TBillVO;
/**
* <p>
@@ -13,4 +16,11 @@
*/
public interface TBillService extends IService<TBill> {
+ /**
+ * 获取账单列表
+ * @param query
+ * @return
+ */
+ PageInfo<TBillVO> pageList(TBillQuery query);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index c0e3bd4..da5f143 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -1,9 +1,12 @@
package com.ruoyi.system.service.impl;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TBillMapper;
import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.query.TBillQuery;
import com.ruoyi.system.service.TBillService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.vo.TBillVO;
import org.springframework.stereotype.Service;
/**
@@ -17,4 +20,8 @@
@Service
public class TBillServiceImpl extends ServiceImpl<TBillMapper, TBill> implements TBillService {
+ @Override
+ public PageInfo<TBillVO> pageList(TBillQuery query) {
+ return null;
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TBillVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TBillVO.java
new file mode 100644
index 0000000..cee3da4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TBillVO.java
@@ -0,0 +1,10 @@
+package com.ruoyi.system.vo;
+
+import com.ruoyi.system.model.TBill;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "缴费账单VO")
+public class TBillVO extends TBill {
+}
--
Gitblit v1.7.1