From a7e51f7d5d77a0019723c5dcf1a65599a4bf2b7b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 11:23:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 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 6f96a31..817149c 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
@@ -1,5 +1,19 @@
package com.panzhihua.service_user.dao;
+import java.util.Date;
+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.springframework.web.bind.annotation.RequestParam;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,6 +38,7 @@
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;
@@ -74,6 +89,9 @@
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);
@@ -357,9 +375,9 @@
*/
Map<String, Long> getDailyAddAndActive(@Param("date") Date date, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);
- Map<String, Long> getDailyAdd(@Param("createAt") String createAt, @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);
- Map<String, Long> getActive(@Param("lastLoginTime") String lastLoginTime, @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);
@@ -390,4 +408,39 @@
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);
+
+ /**
+ * 是否为物业公司后台账号
+ * */
+ Long isPropertyAccount(String phone);
+
+
+ String getCommunityAppId(Long communityId);
}
--
Gitblit v1.7.1