From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java
index f89dd32..357d516 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java
@@ -1,7 +1,16 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.query.TBillQuery;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
/**
* <p>
@@ -11,6 +20,30 @@
* @author xiaochen
* @since 2025-01-17
*/
+@Mapper
public interface TBillMapper extends BaseMapper<TBill> {
+ PageInfo<TBillDto> page(@Param("pageInfo") PageInfo<TBill> pageInfo, @Param("query") TBillQuery query);
+
+ List<TBillDto> getBillList(@Param("query")TBillQuery query);
+
+ /**
+ * 获取开票列表
+ * @param query
+ * @param pageInfo
+ * @return
+ */
+ List<TBillDto> invoiceList(@Param("query")TBillQuery query, @Param("pageInfo")PageInfo<TBillDto> pageInfo);
+
+ TBillDto selectDetailByBillId(@Param("billId") String billId);
+
+ BigDecimal statisticsAllRent();
+
+ BigDecimal statisticsNoPay();
+
+ BigDecimal statisticsPayed();
+
+ BigDecimal statisticsOverdue();
+
+ Integer batchBillCount(@Param("userId")String userId, @Param("billIds")List<String> billIds);
}
--
Gitblit v1.7.1