From 2cad3b644a32880cfaf52f87bf6add621db81842 Mon Sep 17 00:00:00 2001 From: zhongrj <123456> Date: Mon, 05 Dec 2022 15:01:25 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptht-public --- src/main/java/org/springblade/modules/system/service/IUserService.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java index 9a4b554..2a49547 100644 --- a/src/main/java/org/springblade/modules/system/service/IUserService.java +++ b/src/main/java/org/springblade/modules/system/service/IUserService.java @@ -28,6 +28,7 @@ import org.springblade.modules.system.entity.UserInfo; import org.springblade.modules.system.entity.UserOauth; import org.springblade.modules.system.excel.UserExcel; +import org.springblade.modules.system.excel.UserExcels; import org.springblade.modules.system.vo.UserDistrictStatisVO; import org.springblade.modules.system.vo.UserRegisterStatisVO; import org.springblade.modules.system.vo.UserVO; @@ -268,6 +269,8 @@ * 统计六大队伍 */ List<UserRegisterStatisVO> getUserTypeCount(); + List<UserRegisterStatisVO> getUserTypeCountXq(String xid); + List<UserVO> getUserTypeList(String xid,String index); List<UserDistrictStatisVO> getUserDistrictTypeCount(); @@ -284,5 +287,14 @@ */ Integer selectCount(String account); void updateAcc(String stype,String account); + boolean firstLogin(String id); void delete(String account); + + + /** + * 保安员导入 + * @param data + * @param isCovered + */ + void importUsers(List<UserExcels> data, Boolean isCovered); } -- Gitblit v1.9.3