From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/UserMapper.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/UserMapper.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/UserMapper.java
index 06c2b7f..a63c5dd 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/UserMapper.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/UserMapper.java
@@ -22,24 +22,28 @@
/**
* 获取用户增量趋势
*
- * @param cityIds 城市id集合
+ * @param city 城市id集合
* @return 折线图数据
*/
- List<UserTrendsVO> userTrends(@Param("ids") List<String> cityIds);
+ List<UserTrendsVO> userTrends(@Param("city") List<String> city);
+ List<UserTrendsVO> userTrends1(@Param("city") List<String> city,@Param("userIds") List<Integer> userIds);
/**
* 统计本年度，注册用户数量
*
- * @param ids 城市id
+ * @param cityList 城市集合
* @return 注册用户数量
*/
- Long increaseNumberByYear(@Param("ids") List<String> ids);
+ Long increaseNumberByYear(@Param("cityList") List<String> cityList);
+ Long increaseNumberByYear1(@Param("cityList") List<String> cityList,@Param("userIds") List<Integer> userIds);
/**
* 统计本月，注册用户数量
*
- * @param cityIdList 城市id
+ * @param cityList 城市列表
* @return 注册用户数量
*/
- Long increaseNumberByMonth(@Param("ids") List<String> cityIdList);
+ Long increaseNumberByMonth(@Param("cityList") List<String> cityList);
+ Long increaseNumberByMonth1(@Param("cityList") List<String> cityList,@Param("userIds") List<Integer> userIds);
+
}
--
Gitblit v1.7.1