From 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 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..8b750ea 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,17 @@
 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 com.ruoyi.system.vo.ScreenRentRankVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +21,41 @@
  * @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(@Param("busDeptId") String busDeptId);
+
+    BigDecimal statisticsNoPay(@Param("busDeptId") String busDeptId);
+
+    BigDecimal statisticsPayed(@Param("busDeptId") String busDeptId);
+
+    BigDecimal statisticsOverdue(@Param("busDeptId") String busDeptId);
+
+    Integer batchBillCount(@Param("userId")String userId, @Param("billIds")List<String> billIds);
+    /**
+     * 街道租金排行
+     * @return
+     */
+    List<ScreenRentRankVO> getStreetRentRank(@Param("businessDeptId") String businessDeptId);
+    /**
+     * 查询季付账单
+     * @param businessDeptId
+     * @return
+     */
+    List<TBill> getJiFuBillList(@Param("businessDeptId") String businessDeptId, @Param("first") Date first, @Param("last") Date last);
 }

--
Gitblit v1.7.1