From eb6fc0ebcfe457fc30f65e8dfb15b8b05bebda51 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 18 十月 2022 10:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 105 insertions(+), 12 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 d80fc05..9e9516c 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
@@ -5,7 +5,10 @@
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;
@@ -25,11 +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.*;
+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.*;
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
@@ -48,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);
@@ -71,7 +87,7 @@
DataKanbanDTO selectCommunityActiveUserOrder(Date date1);
- DataKanbanDTO selectCommunityAddUserOrder(@Param("areaCode")String areaCode,@Param("date1")Date date1);
+ DataKanbanDTO selectCommunityAddUserOrder(@Param("areaCode") String areaCode, @Param("date1") Date date1);
IndexDataVO indexDataCommunityBackstage(Long communityId);
@@ -129,7 +145,7 @@
IPage<GridMemberVO> getGridMemberList(Page page,
- @Param("memberRelationDTO") PageEventGridMemberRelationDTO memberRelationDTO);
+ @Param("memberRelationDTO") PageEventGridMemberRelationDTO memberRelationDTO);
void gridMemberEditStatus(@Param("gridMemberEditDTO") EventGridMemberEditStatusDTO gridMemberEditDTO);
@@ -139,7 +155,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);
@@ -160,7 +176,7 @@
List<ComPbServiceTeamWishVO> getServiceTeamList(@Param("param") String param,
- @Param("communityId") Long communityId);
+ @Param("communityId") Long communityId);
List<SysUserVO> getUserListByCommunityId(@Param("communityId") Long communityId);
@@ -169,6 +185,7 @@
/**
* 禁用/启用便民服务商家账号
+ *
* @param status
* @param userIds
* @return
@@ -177,6 +194,7 @@
/**
* 根据手机号维护社区团队表是否注册
+ *
* @param phone 手机号
*/
void judgeCommunityTeam(@Param("phone") String phone);
@@ -240,12 +258,40 @@
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);
+ int countEasyPhotoMember(@Param("phone") String phone, @Param("communityId") Long userCommunityId);
/**
* 查询防疫工作人员信息
@@ -285,27 +331,74 @@
/**
* 看板用户统计：用户占比统计
* */
- List<UserProportion> userAnalysis(@Param("type") Integer type,@Param("range") String range,@Param("streetId") 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);
+ 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);
+ Integer streetUserCount(@Param("id") Long id,@Param("areaCode")Long areaCode);
/**
* 街道用户统计
* */
- IndexDataKanbanVO dataKanBanStreet(Long streetId);
+ 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);
+ 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);
}
--
Gitblit v1.7.1