From d66b806d685672f2f817986e89f69fb09d130f11 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 09 四月 2025 18:02:32 +0800 Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 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 8b750ea..e0c85e5 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 @@ -26,6 +26,8 @@ PageInfo<TBillDto> page(@Param("pageInfo") PageInfo<TBill> pageInfo, @Param("query") TBillQuery query); + PageInfo<TBillDto> pageForApplet(@Param("pageInfo") PageInfo<TBill> pageInfo, @Param("query") TBillQuery query); + List<TBillDto> getBillList(@Param("query")TBillQuery query); /** @@ -38,13 +40,13 @@ TBillDto selectDetailByBillId(@Param("billId") String billId); - BigDecimal statisticsAllRent(@Param("busDeptId") String busDeptId); + BigDecimal statisticsAllRent(@Param("query") TBillQuery query); - BigDecimal statisticsNoPay(@Param("busDeptId") String busDeptId); + BigDecimal statisticsNoPay(@Param("query") TBillQuery query); - BigDecimal statisticsPayed(@Param("busDeptId") String busDeptId); + BigDecimal statisticsPayed(@Param("query") TBillQuery query); - BigDecimal statisticsOverdue(@Param("busDeptId") String busDeptId); + BigDecimal statisticsOverdue(@Param("query") TBillQuery query); Integer batchBillCount(@Param("userId")String userId, @Param("billIds")List<String> billIds); /** -- Gitblit v1.7.1