Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-10-15 08eefab8f0b04018dc62928ec2191bcae9d3e7d0

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -4,7 +4,10 @@
import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.vos.community.*;
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;

@@ -22,8 +25,6 @@
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.screen.event.EventGridMemberVO;
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamWishVO;
@@ -69,8 +70,12 @@

    List<DataKanbanDTO> selectCommunityUserOrder();

    List<DataKanbanDTO> selectCommunityUserOrderMonth();


    DataKanbanDTO selectCommunityActiveUserOrder(Date date1);

    DataKanbanDTO selectCommunityAddUserOrder(Date date1);


    IndexDataVO indexDataCommunityBackstage(Long communityId);
@@ -166,4 +171,43 @@

    int putUserTag(@Param("sysUserDO") SysUserDO sysUserDO);

    /**
     * 禁用/启用便民服务商家账号
     * @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 streetId  街道id
     * @return  社区列表以及统计人数
     */
    List<IndexUserCommunityVo> getUserCommunityList(@Param("streetId") Long streetId);

    /**
     * 查询街道下社区注册人数统计数据导出
     * @return  社区注册人数统计数据导出
     */
    List<IndexUserStreetExcelExportVo> getUserCommunityExcelExport();
}