From 016cb75c18114b9d165a2749be6e1b405aa26d07 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 08 十一月 2022 16:54:30 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 275 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 68be92b..26c3b6e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -4,9 +4,13 @@
import java.util.List;
import java.util.Map;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
+import com.panzhihua.common.model.vos.sanshuo.ComSanshuoExpertVO;
+import com.panzhihua.common.model.vos.user.*;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.*;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;
@@ -24,17 +28,24 @@
import com.panzhihua.common.model.vos.IndexDataKanbanVO;
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
-import com.panzhihua.common.model.vos.community.ComActVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridMemberVO;
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamWishVO;
-import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
-import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
-import com.panzhihua.common.model.vos.user.SysUserVO;
-import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO;
+import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
+import com.panzhihua.service_user.model.dtos.UsersStatisticsDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -53,11 +64,11 @@
IPage<AdministratorsUserVO> pageUserBackstage(Page page,
- @Param("administratorsUserVO") AdministratorsUserVO administratorsUserVO);
+ @Param("administratorsUserVO") AdministratorsUserVO administratorsUserVO);
IPage<SysUserVO> pageUserAppletsBackstage(Page page,
- @Param("pageUserAppletsBackstageDTO") PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO);
+ @Param("pageUserAppletsBackstageDTO") PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO);
int deleteUserTest(Long userId);
@@ -66,14 +77,21 @@
IPage<SysUserNoticeVO> pageNotice(Page page, @Param("pageDTO") PageDTO pageDTO);
- IndexDataKanbanVO selectIndexDataKanban();
+ IndexDataKanbanVO selectIndexDataKanban(@Param("areaCode") String areaCode);
- List<DataKanbanDTO> selectCommunityUserOrder();
+ IPage<DataKanbanDTO> selectCommunityUserOrder(Page page, @Param("areaCode") String areaCode);
+
+ IPage<DataKanbanDTO> selectCommunityUserOrderMonth(Page page, @Param("areaCode") String areaCode);
DataKanbanDTO selectCommunityActiveUserOrder(Date date1);
+ DataKanbanDTO selectCommunityAddUserOrder(@Param("areaCode") String areaCode, @Param("date1") Date date1);
+
+ List<UsersStatisticsDTO> selectDailyAdd(@Param("createAt") String createAt, @Param("appId") String appId);
+
+ List<UsersStatisticsDTO> selectActive(@Param("lastLoginTime") String lastLoginTime, @Param("appId") String appId);
IndexDataVO indexDataCommunityBackstage(Long communityId);
@@ -130,7 +148,7 @@
IPage<GridMemberVO> getGridMemberList(Page page,
- @Param("memberRelationDTO") PageEventGridMemberRelationDTO memberRelationDTO);
+ @Param("memberRelationDTO") PageEventGridMemberRelationDTO memberRelationDTO);
void gridMemberEditStatus(@Param("gridMemberEditDTO") EventGridMemberEditStatusDTO gridMemberEditDTO);
@@ -140,7 +158,7 @@
void addLcMember(@Param("lcMemberId") Long lcMemberId, @Param("userId") Long userId,
- @Param("userName") String userName);
+ @Param("userName") String userName);
void delLcMember(@Param("gridMemberId") Long gridMemberId);
@@ -161,7 +179,7 @@
List<ComPbServiceTeamWishVO> getServiceTeamList(@Param("param") String param,
- @Param("communityId") Long communityId);
+ @Param("communityId") Long communityId);
List<SysUserVO> getUserListByCommunityId(@Param("communityId") Long communityId);
@@ -170,9 +188,251 @@
/**
* 禁用/启用便民服务商家账号
+ *
* @param status
* @param userIds
* @return
*/
int disableOrEnableMerchantUsers(@Param("status") Integer status, @Param("userIds") List<Long> userIds);
+
+ /**
+ * 根据手机号维护社区团队表是否注册
+ *
+ * @param phone 手机号
+ */
+ void judgeCommunityTeam(@Param("phone") String phone);
+
+ /**
+ * 根据手机号查询社区团队表中用户数量
+ *
+ * @param phone 手机号
+ * @return 用户数量
+ */
+ Integer getCommunityTeamCount(@Param("phone") String phone);
+
+ /**
+ * 查询西区所有街道列表以及统计人数
+ *
+ * @return 西区所有街道列表以及统计人数
+ */
+ List<IndexUserStreetVo> getUserStreetList(@Param("areaCode") String areaCode);
+
+ /**
+ * 查询街道下社区列表以及统计人数
+ *
+ * @param streetId 街道id
+ * @return 社区列表以及统计人数
+ */
+ List<IndexUserCommunityVo> getUserCommunityList(@Param("streetId") Long streetId);
+
+ /**
+ * 查询街道下社区注册人数统计数据导出
+ *
+ * @return 社区注册人数统计数据导出
+ */
+ List<IndexUserStreetExcelExportVo> getUserCommunityExcelExport(String areaCode);
+
+ /**
+ * 查看是否是社区物业人员
+ *
+ * @param userId
+ * @param userCommunityId
+ * @return
+ */
+ int countPropertyWorker(@Param("userId") Long userId, @Param("communityId") Long userCommunityId);
+
+ /**
+ * 查看是否社工
+ *
+ * @param phone
+ * @param communityId
+ * @return
+ */
+ int countSocialWorker(@Param("phone") String phone, @Param("communityId") Long communityId);
+
+ /**
+ * 查看是否社会组织
+ *
+ * @param userId
+ * @return
+ */
+ int countSocialOrg(Long userId);
+
+
+ /**
+ * 查看是否是微团队成员
+ *
+ * @param phone
+ * @param userCommunityId
+ * @return
+ */
+ int countFmsMember(@Param("phone") String phone, @Param("communityId") Long userCommunityId);
+
+ /**
+ * 查询街道信息
+ *
+ * @param streetId
+ * @return
+ */
+ ComStreetVO selectStreetById(@Param("streetId") Long streetId);
+
+ /**
+ * 查询是否是社会组织成员
+ *
+ * @param userId
+ * @return
+ */
+ int countSocialOrgMember(@Param("userId") Long userId);
+
+ /**
+ * 查询是否社会组织联系人
+ *
+ * @param phone
+ * @return
+ */
+ int countOrgNum(@Param("phone") String phone);
+
+ /**
+ * 查询是否人大代表
+ *
+ * @param phone
+ * @param userCommunityId
+ * @return
+ */
+ int selectCountDpc(@Param("phone") String phone, @Param("userCommunityId") Long userCommunityId);
+
+ /**
+ * 查看是否网格员
+ *
+ * @param phone
+ * @param userCommunityId
+ * @return
+ */
+ int countEasyPhotoMember(@Param("phone") String phone, @Param("communityId") Long userCommunityId);
+
+ /**
+ * 查询防疫工作人员信息
+ *
+ * @param phone
+ * @return
+ */
+ ComActAcidMemberVO selectAcidMemberByPhone(@Param("phone") String phone);
+
+ /**
+ * 查询单位管理员
+ *
+ * @param phone
+ * @return
+ */
+ Integer selectOrgAdmin(@Param("phone") String phone);
+
+ /**
+ * 查询报道单位id
+ *
+ * @param phone
+ * @return
+ */
+ Long selectCheckUnitId(@Param("phone") String phone);
+
+ /**
+ * 根据社区名称查询区县社区联动关系
+ *
+ * @param relationName
+ * @return
+ */
+ List<ComAreaTownCommunityVO> selectAreaTownCommunity(@Param("relationName") String relationName);
+
+ /**
+ * 根据街道id查询区域名称
+ *
+ * @param streetId
+ * @return
+ */
+ String selectAreaCodeByStreetId(Long streetId);
+
+ /**
+ * 看板用户统计：用户占比统计
+ */
+ List<UserProportion> userAnalysis(@Param("type") Integer type, @Param("range") String range, @Param("streetId") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);
+
+ /**
+ * 统计区域实名用户数
+ */
+ List<RealUser> realUserCount(@Param("type") Integer type, @Param("range") String range, @Param("streetId") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);
+
+ /**
+ * 统计该街道内的所有用户数
+ */
+ Integer streetUserCount(@Param("id") Long id, @Param("areaCode") Long areaCode);
+
+ /**
+ * 街道用户统计
+ */
+ IndexDataKanbanVO dataKanBanStreet(@Param("streetId") Long streetId, @Param("areaCode") Long areaCode, @Param("range") String range);
+
+ /**
+ * 获取当天的新增和日活
+ */
+ Map<String, Long> getDailyAddAndActive(@Param("date") Date date, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);
+
+ List<UsersStatisticsDTO> getDailyAdd(@Param("createAt") String createAt, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);
+
+ List<UsersStatisticsDTO> getActive(@Param("lastLoginTime") String lastLoginTime, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);
+
+
+ List<StreetVOS> selectStreetByAreaCode(Integer code);
+
+ List<StreetVO> selectStreetsByAreaCode(Integer code);
+
+ ComActAcidCheckRecordVO selectComActAcidCheckRecordById(Long id);
+
+ ComActAcidRecordVO selectComActAcidRecord(Long id);
+
+ ComActAcidMemberVO selectComActAcidMember(Long id);
+
+ /**
+ * 获取本月的
+ */
+ Integer getMonthUsers(@Param("streetId") Long streetId, @Param("areaCode") Long areaCode, @Param("range") String range, @Param("appId") String appId);
+
+ /**
+ * 获取街道下属村/社区
+ */
+ List<CommunityVO> selectCommunityByStreetId(@Param("id") Long streetId, @Param("type") Integer type);
+
+ /**
+ * 获取账户id
+ */
+ List<Integer> selectIdsByAccount(@Param("array") String[] streetList);
+
+ List<CommunityVO> selectCommunityByStreetName(String name);
+
+ StreetVOS selectStreetByName(String name);
+
+ /**
+ * 是否为专家
+ */
+ ComSanshuoExpertVO isExpert(String phone);
+
+ /**
+ * 当前账号是否为专家后台账号
+ */
+ int isIndustryCenterAccount(String account);
+
+ /**
+ * 当前账号是否为专家后台账号
+ */
+ int isExpertAccount(String account);
+
+ /**
+ * 查询两个appid的用户做更新
+ * @param userId
+ * @return
+ */
+ List<SysUserDO> selectByUserId(@Param("userId") Long userId);
+
+ /**
+ * 是否为党员
+ * */
+ int isDpcMember(@Param("phone") String phone,@Param("name")String name);
}
--
Gitblit v1.7.1