三说会堂bug修改

张天森

2022-10-26 a80e2804cac1ec32a24ef5cf2a834b5fe83fc1ed

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

@@ -8,6 +8,7 @@
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;
@@ -27,15 +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.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
@@ -54,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);
@@ -77,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);
@@ -135,7 +145,7 @@


    IPage<GridMemberVO> getGridMemberList(Page page,
        @Param("memberRelationDTO") PageEventGridMemberRelationDTO memberRelationDTO);
                                          @Param("memberRelationDTO") PageEventGridMemberRelationDTO memberRelationDTO);


    void gridMemberEditStatus(@Param("gridMemberEditDTO") EventGridMemberEditStatusDTO gridMemberEditDTO);
@@ -145,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);
@@ -166,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);
@@ -175,6 +185,7 @@

    /**
     * 禁用/启用便民服务商家账号
     *
     * @param status
     * @param userIds
     * @return
@@ -183,6 +194,7 @@

    /**
     * 根据手机号维护社区团队表是否注册
     *
     * @param phone 手机号
     */
    void judgeCommunityTeam(@Param("phone") String phone);
@@ -279,7 +291,7 @@
     * @param userCommunityId
     * @return
     */
    int countEasyPhotoMember(@Param("phone") String phone,@Param("communityId") Long userCommunityId);
    int countEasyPhotoMember(@Param("phone") String phone, @Param("communityId") Long userCommunityId);

    /**
     * 查询防疫工作人员信息
@@ -341,6 +353,10 @@
     * */
    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);

@@ -370,4 +386,24 @@
    List<CommunityVO> selectCommunityByStreetName(String name);

    StreetVOS selectStreetByName(String name);

    /**
     * 是否为专家
     * */
    ComSanshuoExpertVO isExpert(String phone);

    /**
     * 当前账号是否为专家后台账号
     * */
    int isIndustryCenterAccount(String account);

    /**
     * 当前账号是否为专家后台账号
     * */
    int isExpertAccount(String account);

    /**
     * 是否为党员
     * */
    int isDpcMember(@Param("phone") String phone,@Param("name")String name);
}