实有人口导入bug修改

tangxiaobao

2021-08-16 ac4d876533a711a12704ea50e609342e13b2ca08

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -3,20 +3,15 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberEditStatusDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberPassResetDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

@@ -96,10 +91,10 @@
    R putUserFace(LoginUserInfoVO loginUserInfoVO);
    /**
     *分页查询人口管理
     * @param loginUserInfoVO 查询参数
     * @param userInfoVO 查询参数
     * @return 分页数据
     */
    R pageUser(LoginUserInfoVO loginUserInfoVO);
    R pageUser(AppletUserInfoVO userInfoVO);
    /**
     * 查询所有人员标签
     * @return 标签集合
@@ -196,7 +191,7 @@
     * 用户协议
     * @return 协议集合
     */
    R listAgreement();
    R listAgreement(Long communityId);
    /**
     * 编辑用户协议
     * @param sysUserAgreementVO 编辑内容
@@ -449,7 +444,7 @@
     * @param gridMemberDTO 请求参数
     * @return  编辑结果
     */
    R editGridUser(EventGridMemberAddDTO gridMemberDTO);
    R editGridUser(EventGridMemberEditAdminDTO gridMemberDTO);

    /**
     * 网格员重置密码
@@ -461,4 +456,25 @@
    R deleteMembers(List<Long> Ids);

    R gridMemberEditStatus(EventGridMemberEditStatusDTO gridMemberEditDTO);

    R noTips(Long userId);

    /**
     * 查询社区的收益说明
     * @param communityId   社区id
     * @return  收益说明
     */
    R listAgreements(Long communityId);

    R getGridIsOk(Long userId);

    R getGridsMemberList(Long communityId);

    /**
     * 根据用户id查询用户openid
     * @param userId    用户id
     * @return  openid
     */
    R getUserOpenId(Long userId);

}