Merge branch 'huacheng_test' into haucheng_panzhihua

yanghui

2022-11-04 1a6eb2ac656de3b35c64db8b9006db2ed9248872

 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;
@@ -75,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);

@@ -391,4 +408,31 @@
    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);
}