From ff25d4efe0832f204e3b8aba78846409589e3960 Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期一, 31 三月 2025 11:43:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev-0327 --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractMapper.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractMapper.java index b02c309..490e09e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractMapper.java @@ -21,10 +21,16 @@ */ public interface TContractMapper extends BaseMapper<TContract> { - List<TContract> contractList(@Param("query") TContractQuery query, @Param("pageInfo") PageInfo<TContract> pageInfo); + List<TContract> contractList(@Param("query") TContractQuery query, @Param("pageInfo") PageInfo<TContract> pageInfo,@Param("businessDeptId") String businessDeptId); List<TContract> contractAppletList(@Param("query")TContractAppletQuery query, @Param("pageInfo") PageInfo<TContract> pageInfo); List<BillVO> contractBillList(@Param("query") TContractBillQuery query, @Param("pageInfo") PageInfo<BillVO> pageInfo); + List<TContract> contractExportList(@Param("query")TContractQuery query); + /** + * 本月新增租户数 + * @return + */ + Integer getCurrentMonthRentCount(); } -- Gitblit v1.7.1