修改小程序注册流程

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -218,6 +218,9 @@ public interface UserFeignClient {
     @GetMapping("app-user/epdc-app/user/checkUserRegister")
     Result<EpdcUserRegisterInfoResultDTO> getUserRegisterState(EpdcCheckUserRegisterFromDTO fromDto);
 
+    @GetMapping("app-user/epdc-app/user/checkNamUserRegister")
+    Result<EpdcUserRegisterInfoResultDTO> getNamUserRegisterState(EpdcCheckUserRegisterFromDTO fromDto);
+
     /**
      * 用户注册或绑定网格
      *
@@ -229,6 +232,9 @@ public interface UserFeignClient {
     @PostMapping("app-user/epdc-app/user/registerOrBindGrid")
     Result<EpdcUserRegisterInfoResultDTO> registerOrBindGrid(EpdcUserRegisterBindGridFormDTO formDto);
 
+    @PostMapping("app-user/epdc-app/user/namRegisterOrBindGrid")
+    Result<EpdcUserRegisterInfoResultDTO> namRegisterOrBindGrid(EpdcUserRegisterBindGridFormDTO formDto);
+
     /**
      * 更新用户微信信息
      * <p>在完善个人信息时进行更新微信信息，不再单独更新。</p>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -111,11 +111,21 @@ public class UserFeignClientFallback implements UserFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserRegisterState", fromDto);
     }
 
+    @Override
+    public Result<EpdcUserRegisterInfoResultDTO> getNamUserRegisterState(EpdcCheckUserRegisterFromDTO fromDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "checkNamUserRegister", fromDto);
+    }
+
     @Override
     public Result<EpdcUserRegisterInfoResultDTO> registerOrBindGrid(EpdcUserRegisterBindGridFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "registerOrBindGrid", formDto);
     }
 
+    @Override
+    public Result<EpdcUserRegisterInfoResultDTO> namRegisterOrBindGrid(EpdcUserRegisterBindGridFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "namRegisterOrBindGrid", formDto);
+    }
+
     @Override
     public Result<UserDTO> updateWxInfo(UserDTO userDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateWxInfo", userDTO);

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -786,21 +786,18 @@ public class AppUserServiceImpl implements AppUserService {
     @Override
     public Result<EpdcAppAuthorizationDTO> getNMaV2Token(EpdcAppUserRegisterFormDTO formDto) {
         WxMaJscode2SessionResult wxMaResult = this.getNMPWxUser(formDto.getWxCode());
-        String openId = wxMaResult.getOpenid();
-        String unionId = wxMaResult.getUnionid();
-
         // 查询当前微信注册状态
         EpdcCheckUserRegisterFromDTO checkFromDto = new EpdcCheckUserRegisterFromDTO();
-        checkFromDto.setOpenId(openId);
-        checkFromDto.setWxUnionId(unionId);
+        checkFromDto.setOpenId(wxMaResult.getOpenid());
+        checkFromDto.setWxUnionId(wxMaResult.getUnionid());
         checkFromDto.setGridId(formDto.getGridId());
-        Result<EpdcUserRegisterInfoResultDTO> userResult = userFeignClient.getUserRegisterState(checkFromDto);
+        Result<EpdcUserRegisterInfoResultDTO> userResult = userFeignClient.getNamUserRegisterState(checkFromDto);
         if (!userResult.success()) {
             return new Result<EpdcAppAuthorizationDTO>().error(userResult.getMsg());
         }
         // IP地址
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
-        Result<EpdcAppAuthorizationDTO> result = this.dealWithUserRegisterState(userResult.getData(), openId, unionId, IpUtils.getIpAddr(request), formDto.getInviteUserId(), formDto.getGridId());
+        Result<EpdcAppAuthorizationDTO> result = npmDealWithUserRegisterState(userResult.getData(), wxMaResult.getOpenid(), wxMaResult.getUnionid(), IpUtils.getIpAddr(request), formDto.getInviteUserId(), formDto.getGridId());
         return result;
     }
 
@@ -863,7 +860,7 @@ public class AppUserServiceImpl implements AppUserService {
         // 用户注册或绑定网格
         if (NumConstant.TWO != registerState) {
             // 组装用户关联网格信息
-            registerBindGridFormDto.setGridRelationDTO(this.packageUserGridRelationInfo(gridId));
+            registerBindGridFormDto.setGridRelationDTO(packageUserGridRelationInfo(gridId));
             registerBindGridFormDto.setInviteUserId(inviteUserId);
             // 用户并绑定网格
             Result<EpdcUserRegisterInfoResultDTO> registerBindGridResultDto = userFeignClient.registerOrBindGrid(registerBindGridFormDto);
@@ -889,6 +886,52 @@ public class AppUserServiceImpl implements AppUserService {
         return new Result<EpdcAppAuthorizationDTO>().ok(authorization);
     }
 
+    private Result<EpdcAppAuthorizationDTO> npmDealWithUserRegisterState(EpdcUserRegisterInfoResultDTO userResult, String openId, String unionId, String ipAddress, String inviteUserId, Long currentGridId) {
+        EpdcUserRegisterBindGridFormDTO registerBindGridFormDto = new EpdcUserRegisterBindGridFormDTO();
+        // 用户注册状态 0-未注册未绑定网格，1-已注册未绑定当前网格，2-已注册已绑定当前网格
+        Integer registerState = userResult.getRegisterState();
+        UserDTO registeredUser = userResult.getUserDTO();
+        Long gridId = userResult.getGridId();
+
+        if (NumConstant.ZERO == registerState) {// 未注册,组装用户注册信息
+            registerBindGridFormDto.setRegisterState(NumConstant.ZERO);
+            registeredUser = packageUserInfo(openId, unionId, ipAddress);
+            gridId = currentGridId;
+            registeredUser.setDeptId(currentGridId);
+            registerBindGridFormDto.setUserDTO(registeredUser);
+        } else if (NumConstant.ONE == registerState) {// 已注册未绑定当前网格
+            registerBindGridFormDto.setRegisterState(NumConstant.ONE);
+            registerBindGridFormDto.setUserDTO(registeredUser);
+        }
+
+        if (NumConstant.TWO != registerState) {// 用户注册或绑定网格
+            // 组装用户关联网格信息
+            registerBindGridFormDto.setGridRelationDTO(packageUserGridRelationInfo(gridId));
+            registerBindGridFormDto.setInviteUserId(inviteUserId);
+            // 用户并绑定网格
+            Result<EpdcUserRegisterInfoResultDTO> registerBindGridResultDto = userFeignClient.namRegisterOrBindGrid(registerBindGridFormDto);
+            if (!registerBindGridResultDto.success()) {
+                return new Result<EpdcAppAuthorizationDTO>().error(registerBindGridResultDto.getMsg());
+            }
+            userResult = registerBindGridResultDto.getData();
+            registeredUser = userResult.getUserDTO();
+            // 用户已认证为党员，绑定网格时加入该网格党员群
+            if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) {
+                UserGridRelationDTO userGridRelationDto = new UserGridRelationDTO();
+                userGridRelationDto.setGridId(userResult.getGridId());
+                this.joinGridPartyGroup(registeredUser, Collections.singletonList(userGridRelationDto), NumConstant.ZERO_STR);
+            }
+        }
+
+        // 已注册已绑定当前网格
+        TokenDto tokenDto = ConvertUtils.sourceToTarget(registeredUser, TokenDto.class);
+        tokenDto.setUserId(registeredUser.getId());
+        tokenDto.setGridId(gridId);
+        EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, userResult.getGrid(), registeredUser.getState());
+
+        return new Result<EpdcAppAuthorizationDTO>().ok(authorization);
+    }
+
     /**
      * 组装用户注册信息
      *
@@ -1352,8 +1395,7 @@ public class AppUserServiceImpl implements AppUserService {
      */
     private void joinGridPartyGroup(UserDTO userDto, List<UserGridRelationDTO> userGridList, String lordFlag) {
         List<GroupUserFormDTO> formDTOList = new ArrayList<>(userGridList.size());
-        for (UserGridRelationDTO dto :
-                userGridList) {
+        for (UserGridRelationDTO dto : userGridList) {
             GroupUserFormDTO formDto = new GroupUserFormDTO();
             formDto.setUserId(userDto.getId());
             formDto.setNickname(userDto.getNickname());
@@ -1365,7 +1407,6 @@ public class AppUserServiceImpl implements AppUserService {
             formDto.setGridId(dto.getGridId());
             formDTOList.add(formDto);
         }
-
         groupFeignClient.joinGridPartyGroup(formDTOList);
 //        groupTask.joinGridPartyGroup(formDto);
     }
@@ -1599,7 +1640,7 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public Result<String> npmUserUpdate(EpdcUserNpmRegisterFormDTO formDto) {
-        UserDTO userDTO = generateUserDTO(formDto);
+        UserDTO userDTO = generateNpmUserDTO(formDto);
         //更新头像
         if (StringUtils.isNotEmpty(formDto.getFaceImg()) && !formDto.getFaceImg().equals(userDTO.getFaceImg())) {
             userDTO.setFaceImg(formDto.getFaceImg());
@@ -1607,7 +1648,7 @@ public class AppUserServiceImpl implements AppUserService {
         return userFeignClient.npmUserUpdate(userDTO);
     }
 
-    private UserDTO generateNpmUserDTO(EpdcUserNpmRegisterFormDTO formDto){
+    private UserDTO generateNpmUserDTO(EpdcUserNpmRegisterFormDTO formDto) {
         EpdcUserRegistFormDTO epdcUserRegistFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcUserRegistFormDTO.class);
         epdcUserRegistFormDTO.setRoad("");
         if (null != formDto.getCouplingCommunity()) {

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java

@@ -233,6 +233,11 @@ public class EpdcAppUserController {
         return userService.checkUserRegisterState(fromDto);
     }
 
+    @GetMapping("checkNamUserRegister")
+    public Result<EpdcUserRegisterInfoResultDTO> checkNamUserRegister(@RequestBody EpdcCheckUserRegisterFromDTO fromDto) {
+        return userService.checkNamUserRegisterState(fromDto);
+    }
+
     /**
      * 用户注册或绑定网格
      *
@@ -246,6 +251,11 @@ public class EpdcAppUserController {
         return userService.saveUserOrBindGrid(fromDto);
     }
 
+    @PostMapping("namRegisterOrBindGrid")
+    public Result<EpdcUserRegisterInfoResultDTO> namRegisterOrBindGrid(@RequestBody EpdcUserRegisterBindGridFormDTO fromDto) {
+        return userService.namSaveUserOrBindGrid(fromDto);
+    }
+
     /**
      * 更新用户微信信息
      *

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java

@@ -192,6 +192,10 @@ public interface UserDao extends BaseDao<UserEntity> {
      */
     List<UserDTO> selectListUserByWxForLogin(@Param("wxOpenId") String wxOpenId, @Param("wxUnionId") String wxUnionId);
 
+
+    List<UserDTO> selectUserByWxForLogin(@Param("wxOpenId") String wxOpenId, @Param("wxUnionId") String wxUnionId);
+
+
     /**
      * @param openId
      * @param unionId
@@ -476,4 +480,8 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @return
      */
     Integer selectCountByIdentityNo(String idCard);
+
+    void updateNpmUserEntity(UserEntity entity);
+
+    void saveEntity(UserEntity userEntity);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDjylDao.java

@@ -0,0 +1,15 @@
+package com.elink.esua.epdc.user.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.user.entity.UserDjylEntity;
+
+/**
+ * 党建引领用户信息表
+ *
+ * @author yan Lu
+ * @description 描述
+ * @create 2023/8/8 10:06
+ */
+
+public interface UserDjylDao extends BaseDao<UserDjylEntity> {
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserDjylEntity.java

@@ -0,0 +1,284 @@
+package com.elink.esua.epdc.user.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 党建引领用户信息表
+ * @author yan Lu
+ * @description 描述
+ * @create 2023/8/8 10:07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("epdc_user_djyl")
+public class UserDjylEntity extends DeptScope {
+
+    private static final long serialVersionUID = 1614112278854051304L;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 注册时间
+     */
+    private Date registerTime;
+
+    /**
+     * 头像
+     */
+    private String faceImg;
+
+    /**
+     * 性别(女性-female，男性-male)
+     */
+    private String sex;
+
+    /**
+     * 生日
+     */
+    private Date birthday;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 电话
+     */
+    private String telephone;
+
+    /**
+     * 邮编
+     */
+    private String zipCode;
+
+    /**
+     * 职业
+     */
+    private String profession;
+
+    /**
+     * 爱好
+     */
+    private String hobbies;
+
+    /**
+     * 个性签名
+     */
+    private String userSign;
+
+    /**
+     * 邀请码
+     */
+    private String invitationCode;
+
+    /**
+     * 最近登录时间
+     */
+    private Date lastLoginTime;
+
+    /**
+     * 最近登录IP
+     */
+    private String lastLoginIp;
+
+    /**
+     * 最近登录位置经度
+     */
+    private String lastLongitude;
+
+    /**
+     * 最近登录位置维度
+     */
+    private String lastLatitude;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 身份证号
+     */
+    private String identityNo;
+
+    /**
+     * 所在道路（如山东路168号）
+     */
+    private String road;
+
+    /**
+     * 小区名称
+     */
+    private String villageName;
+
+    /**
+     * 住处（楼栋-单元-房间）
+     */
+    private String dwellingPlace;
+
+    /**
+     * 居民住址
+     */
+    private String address;
+
+    /**
+     * 微信OPENID
+     */
+    private String wxOpenId;
+
+    /**
+     * 微信unionId
+     */
+    private String wxUnionId;
+
+    /**
+     * 是否是党员(0-否，1-是)
+     */
+    private String partyFlag;
+
+    /**
+     * 注册方式（wx：微信注册）
+     */
+    private String registerWay;
+
+    /**
+     * 用户来源(wp:公众号)
+     */
+    private String registerSource;
+
+    /**
+     * 手机号所属省份
+     */
+    private String mobileProvince;
+
+    /**
+     * 手机号所属城市
+     */
+    private String mobileCity;
+
+    /**
+     * 手机号所属运营商
+     */
+    private String mobileCarrier;
+
+    /**
+     * 用户积分
+     */
+    private Integer points;
+
+    /**
+     * 邀请人ID
+     */
+    private String inviteUserId;
+
+    /**
+     * 状态(0-未审核，1-审核通过，2-审核未通过)
+     */
+    private String state;
+
+
+    /**
+     * 姓
+     */
+    private String lastName;
+
+    /**
+     * 名
+     */
+    private String firstName;
+
+    /**
+     * 审核备注
+     */
+    private String remark;
+
+    /**
+     * 居住网格id
+     */
+    private Long deptId;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
+
+    /**
+     * 是否有车
+     */
+    private String rentFlag;
+
+    /**
+     * 是否租房
+     */
+    private String driverFlag;
+
+
+    /**
+     * 活跃积分
+     */
+    private Integer activePoints;
+
+    /**
+     * 工作单位
+     */
+    private String workUnit;
+
+    /**
+     * 单位性质
+     */
+    private String workType;
+
+    /**
+     * 工作单位行业
+     */
+    private String workIndustry;
+
+    /**
+     * 是否居住在市北
+     */
+    private Integer shibei;
+
+    /**
+     * 所属行业其他
+     */
+    private String workIndustryText;
+
+    /**
+     * 包联单位
+     */
+    private String couplingCommunity;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java

@@ -221,6 +221,9 @@ public interface UserService extends BaseService<UserEntity> {
      */
     Result<EpdcUserRegisterInfoResultDTO> checkUserRegisterState(EpdcCheckUserRegisterFromDTO fromDto);
 
+
+    Result<EpdcUserRegisterInfoResultDTO> checkNamUserRegisterState(EpdcCheckUserRegisterFromDTO fromDto);
+
     /**
      * 保存用户信息或关联网格信息
      *
@@ -231,6 +234,8 @@ public interface UserService extends BaseService<UserEntity> {
      */
     Result<EpdcUserRegisterInfoResultDTO> saveUserOrBindGrid(EpdcUserRegisterBindGridFormDTO fromDto);
 
+    Result<EpdcUserRegisterInfoResultDTO> namSaveUserOrBindGrid(EpdcUserRegisterBindGridFormDTO fromDto);
+
     /**
      * 验证用户完善个人信息时提交的数据
      *

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java

@@ -75,6 +75,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -93,7 +94,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Autowired
     private UserCarInfoService userCarInfoService;
 
-    @Autowired
+    @Resource
     private PartyMembersDao partyMembersDao;
 
     @Autowired
@@ -105,30 +106,32 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Autowired
     private PartyMembersService partyMembersService;
 
-    @Autowired
+    @Resource
     private UserAuthenticateHistoryDao userAuthenticateHistoryDao;
 
-    @Autowired
+    @Resource
     private PartyAuthenticationFailedDao partyAuthenticationFailedDao;
 
     @Autowired
     private UserTagRelationService userTagRelationService;
 
-    @Autowired
+    @Resource
     private AdminFeignClient adminFeignClient;
 
     @Autowired
     private UserRedis userRedis;
 
-    @Autowired
+    @Resource
     private PointFeignClient pointFeignClient;
 
-    @Autowired
+    @Resource
     private PartyStandardBearerApplyDao partyStandardBearerApplyDao;
 
     @Autowired
     private PartyStandardBearerApplyService partyStandardBearerApplyService;
 
+    @Resource
+    private UserDjylDao djylDao;
 
     @Override
     @DataSource(value = DataSourceNames.FIRST)
@@ -656,6 +659,48 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result<EpdcUserRegisterInfoResultDTO>().ok(resultDto);
     }
 
+    @Override
+    public Result<EpdcUserRegisterInfoResultDTO> checkNamUserRegisterState(EpdcCheckUserRegisterFromDTO fromDto) {
+        Long gridId = fromDto.getGridId();
+        UserDTO userDto = null;
+        String userId = null;
+        List<Long> gridIdList = null;
+        // 查询当前用户信息
+        List<UserDTO> userList = baseDao.selectUserByWxForLogin(fromDto.getOpenId(), fromDto.getWxUnionId());
+        if (null != userList.get(NumConstant.ZERO)) {
+            userDto = userList.get(NumConstant.ZERO);
+            userId = userDto.getId();
+            // 循环集合，确保集合中都是同一个用户的信息
+            for (UserDTO oneUserDto : userList) {
+                if (!userId.equals(oneUserDto.getId())) {
+                    throw new RenException("用户信息异常，无法匹配唯一用户");
+                }
+                gridIdList.add(oneUserDto.getGridId());
+            }
+        }
+        // 组装接口返回结果
+        EpdcUserRegisterInfoResultDTO resultDto = new EpdcUserRegisterInfoResultDTO();
+        resultDto.setGridId(gridId);
+        // 用户已注册
+        if (null != userDto) {
+            resultDto.setUserDTO(userDto);
+            // 已绑定当前网格
+            if (gridIdList.contains(gridId)) {
+                resultDto.setRegisterState(NumConstant.TWO);
+                resultDto.setGrid(userDto.getGrid());
+                // 更新最后一次切换网格时间
+                updateGridSwitchedTime(userId, gridId);
+            } else {
+                resultDto.setRegisterState(NumConstant.ONE);
+            }
+        }
+        // 未注册
+        else {
+            resultDto.setRegisterState(NumConstant.ZERO);
+        }
+        return new Result<EpdcUserRegisterInfoResultDTO>().ok(resultDto);
+    }
+
     /**
      * 用户网格关系表，更新最后访问网格的时间
      *
@@ -679,11 +724,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result<EpdcUserRegisterInfoResultDTO> saveUserOrBindGrid(EpdcUserRegisterBindGridFormDTO fromDto) {
-
-
         UserDTO formUserDto = fromDto.getUserDTO();
         UserGridRelationDTO userGridRel = fromDto.getGridRelationDTO();
-
         // 用户注册
         if (NumConstant.ZERO == fromDto.getRegisterState()) {
             UserEntity userEntity = ConvertUtils.sourceToTarget(formUserDto, UserEntity.class);
@@ -728,6 +770,55 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result<EpdcUserRegisterInfoResultDTO>().ok(resultDto);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<EpdcUserRegisterInfoResultDTO> namSaveUserOrBindGrid(EpdcUserRegisterBindGridFormDTO fromDto) {
+        UserDTO formUserDto = fromDto.getUserDTO();
+        UserGridRelationDTO userGridRel = fromDto.getGridRelationDTO();
+        // 用户注册
+        if (NumConstant.ZERO == fromDto.getRegisterState()) {
+            UserDjylEntity userEntity = ConvertUtils.sourceToTarget(formUserDto, UserDjylEntity.class);
+            if (djylDao.insert(userEntity) > 0) {
+                formUserDto.setId(userEntity.getId());
+            } else {
+                return new Result<EpdcUserRegisterInfoResultDTO>().error("用户注册失败");
+            }
+        }
+        userGridRel.setUserId(formUserDto.getId());
+        //修改数据库结构
+        Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGridId().toString());
+        if (!parentAndAllDeptDTOResult.success()) {
+            return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg());
+        }
+        userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
+        userGridRel.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
+        userGridRel.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
+        userGridRel.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
+        // 用户绑定网格
+        userGridRelationService.save(userGridRel);
+        // 组装用户注册信息
+        EpdcUserRegisterInfoResultDTO resultDto = new EpdcUserRegisterInfoResultDTO();
+        resultDto.setRegisterState(NumConstant.TWO);
+        resultDto.setGrid(userGridRel.getGrid());
+        resultDto.setGridId(userGridRel.getGridId());
+        resultDto.setUserDTO(formUserDto);
+
+        // 记录邀请记录
+        if (StringUtils.isNotEmpty(fromDto.getInviteUserId())) {
+            UserInvitationRecordEntity entity = new UserInvitationRecordEntity();
+            entity.setUserId(formUserDto.getId());
+            entity.setInviteUserId(fromDto.getInviteUserId());
+            // 获取用户信息
+            UserDTO userDto = this.get(formUserDto.getId());
+            entity.setRegisterTime(userDto.getRegisterTime());
+            entity.setGrid(userGridRel.getGrid());
+            entity.setGridId(userGridRel.getGridId());
+            userInvitationRecordService.insert(entity);
+        }
+
+        return new Result<EpdcUserRegisterInfoResultDTO>().ok(resultDto);
+    }
+
     @Override
     @DataSource(value = DataSourceNames.FIRST)
     public Result<String> verifyUserCompleteData(UserDTO userDto) {
@@ -2106,9 +2197,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             return new Result<String>().error(parentAndAllDeptDTOResult.getMsg());
         }
 
-        UserEntity entity = ConvertUtils.sourceToTarget(userDto, UserEntity.class);
+        UserDjylEntity entity = ConvertUtils.sourceToTarget(userDto, UserDjylEntity.class);
         entity.setId(userDto.getUserId());
-        baseDao.updateById(entity);
+        djylDao.updateById(entity);
 
         UserGridRelationEntity entity1 = new UserGridRelationEntity();
         entity1.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -347,7 +347,7 @@
         ) AS AUTHENTICATED_FLAG
         FROM
         epdc_user u
-        where  u.DEL_FLAG = '0'
+        where u.DEL_FLAG = '0'
         and date_format( u.CREATED_TIME, '%Y-%m-%d' ) > date_format( date_add( now( ), INTERVAL - 90 day), '%Y-%m-%d' )
         <choose>
             <when test="gridId != null and gridId > 0">AND u.DEPT_ID = #{gridId}</when>
@@ -439,11 +439,24 @@
         WHERE
         u.DEL_FLAG = '0'
         <if test="wxOpenId != null and wxOpenId !=''">AND u.WX_OPEN_ID = #{wxOpenId}</if>
-<!--        <if test="wxUnionId != null and wxUnionId !=''">AND u.WX_UNION_ID = #{wxUnionId}</if>-->
+        <!--        <if test="wxUnionId != null and wxUnionId !=''">AND u.WX_UNION_ID = #{wxUnionId}</if>-->
         ORDER BY
         ur.SWITCHED_TIME DESC
     </select>
 
+    <select id="selectUserByWxForLogin" resultType="com.elink.esua.epdc.user.dto.UserDTO">
+        SELECT
+        u.ID, u.NICKNAME, u.FACE_IMG, u.MOBILE, u.PARTY_FLAG, u.REAL_NAME, u.SEX, u.STATE, ur.GRID_ID, ur.GRID
+        FROM
+        epdc_user_djyl u
+        LEFT JOIN epdc_user_grid_relation ur ON u.ID = ur.USER_ID AND ur.DEL_FLAG = '0'
+        WHERE u.DEL_FLAG = '0'
+        <if test="wxOpenId != null and wxOpenId !=''">
+            AND u.WX_OPEN_ID = #{wxOpenId}
+        </if>
+        ORDER BY ur.SWITCHED_TIME DESC
+    </select>
+
     <resultMap id="CachingUserInfoDTOMap" type="com.elink.esua.epdc.user.dto.CachingUserInfoDTO">
         <result property="userId" column="ID"/>
         <result property="nickname" column="NICKNAME"/>
@@ -720,7 +733,7 @@
         <if test="startTime != '' and endTime != ''">
             AND DATE_FORMAT( u.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} and #{endTime}
         </if>
-        and u.DEPT_ID  IN
+        and u.DEPT_ID IN
         <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
             #{deptId}
         </foreach>
@@ -730,7 +743,7 @@
         <if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
         ) USER
         WHERE
-         1 = 1
+        1 = 1
         <if test="streetId != '' and streetId != null">
             AND (find_in_set(#{streetId},USER.PARENT_DEPT_IDS)
             OR find_in_set(#{streetId},USER.ALL_DEPT_IDS))
@@ -820,7 +833,7 @@
         LIMIT 1
         ) AS AUTHENTICATED_FLAG, -- 认证标识
         ifnull(if(u.DEPT_ID = 0, NULL, u.DEPT_ID), (
-        SELECT  GRID_ID FROM epdc_user_grid_relation
+        SELECT GRID_ID FROM epdc_user_grid_relation
         WHERE DEL_FLAG = '0' AND USER_ID = u.ID
         ORDER BY
         CREATED_TIME,
@@ -829,11 +842,11 @@
         )) AS DEPT_ID
         FROM
         epdc_user u
-        where  u.DEL_FLAG = '0'
+        where u.DEL_FLAG = '0'
         <if test="startTime != '' and endTime != ''">
             and DATE_FORMAT(u.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}
         </if>
-         and u.DEPT_ID IN
+        and u.DEPT_ID IN
         <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
             #{deptId}
         </foreach>
@@ -974,70 +987,70 @@
     </select>
 
     <select id="selectFaildAuthenticatedListUserDto" resultType="com.elink.esua.epdc.user.dto.UserDTO">
-       <!-- SELECT
-        u.id,
-        u.REAL_NAME,
-        u.NICKNAME,
-        u.MOBILE,
-        u.REGISTER_TIME,
-        u.CREATED_TIME,
-        u.UPDATED_TIME,
-        IDENTITY_NO,
-        u.ADDRESS,
-        STATE,
-        PARTY_FLAG,
-        IFNULL(u.ALL_DEPT_NAMES,RELATION.ALL_DEPT_NAMES) ALL_DEPT_NAMES,
-        u.FACE_IMG
-        FROM
-        epdc_user u
-        LEFT JOIN (
-        SELECT
-        MAX( CREATED_TIME ) AS CREATED_TIME,
-        USER_ID
-        FROM
-        epdc_user_authenticate_history
-        WHERE
-        DEL_FLAG = '0'
-        AND AUTHENTICATED_TYPE IN ( '0', '1' )
-        <if test="endTime != ''">
-            and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
-        </if>
-        GROUP BY USER_ID
-        ) MAXHIS ON MAXHIS.USER_ID = u.ID
-        LEFT JOIN epdc_user_authenticate_history HISTORY ON HISTORY.USER_ID = MAXHIS.USER_ID AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME AND HISTORY.DEL_FLAG = '0'
-        LEFT JOIN (
-        SELECT MIN( ug.CREATED_TIME ) AS CREATED_TIME,
-        ug.USER_ID FROM epdc_user_grid_relation ug
-        WHERE
-        ug.DEL_FLAG = '0'
-        GROUP BY USER_ID
-        ) MINRELA ON MINRELA.USER_ID = u.ID
-        LEFT JOIN epdc_user_grid_relation RELATION ON RELATION.USER_ID = MINRELA.USER_ID AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
-        where u.del_flag = '0'
-        <if test="startTime != '' and endTime != ''">and DATE_FORMAT(u.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
-        <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
-        <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
-        <if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
-        <if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
-        AND IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN
-        <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
-            #{deptId}
-        </foreach>
-        <if test="streetId != '' and streetId != null">
-            AND (find_in_set(#{streetId},IFNULL(if(u.PARENT_DEPT_IDS = '',null,u.PARENT_DEPT_IDS),RELATION.PARENT_DEPT_IDS))
-            OR find_in_set(#{streetId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
-        </if>
-        <if test="communityId != '' and communityId != null">
-            AND (find_in_set(#{communityId},IFNULL(if(u.PARENT_DEPT_IDS = '',null,u.PARENT_DEPT_IDS),RELATION.PARENT_DEPT_IDS))
-            OR find_in_set(#{communityId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
-        </if>
-        <if test="gridId != '' and gridId != null">
-            and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
-            OR find_in_set(#{gridId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
-        </if>
-        and HISTORY.AUTHENTICATED_TYPE='0' and HISTORY.AUTHENTICATED_FLAG = '0'
-        GROUP BY u.ID
-        ORDER BY u.register_time desc  -->
+        <!-- SELECT
+         u.id,
+         u.REAL_NAME,
+         u.NICKNAME,
+         u.MOBILE,
+         u.REGISTER_TIME,
+         u.CREATED_TIME,
+         u.UPDATED_TIME,
+         IDENTITY_NO,
+         u.ADDRESS,
+         STATE,
+         PARTY_FLAG,
+         IFNULL(u.ALL_DEPT_NAMES,RELATION.ALL_DEPT_NAMES) ALL_DEPT_NAMES,
+         u.FACE_IMG
+         FROM
+         epdc_user u
+         LEFT JOIN (
+         SELECT
+         MAX( CREATED_TIME ) AS CREATED_TIME,
+         USER_ID
+         FROM
+         epdc_user_authenticate_history
+         WHERE
+         DEL_FLAG = '0'
+         AND AUTHENTICATED_TYPE IN ( '0', '1' )
+         <if test="endTime != ''">
+             and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
+         </if>
+         GROUP BY USER_ID
+         ) MAXHIS ON MAXHIS.USER_ID = u.ID
+         LEFT JOIN epdc_user_authenticate_history HISTORY ON HISTORY.USER_ID = MAXHIS.USER_ID AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME AND HISTORY.DEL_FLAG = '0'
+         LEFT JOIN (
+         SELECT MIN( ug.CREATED_TIME ) AS CREATED_TIME,
+         ug.USER_ID FROM epdc_user_grid_relation ug
+         WHERE
+         ug.DEL_FLAG = '0'
+         GROUP BY USER_ID
+         ) MINRELA ON MINRELA.USER_ID = u.ID
+         LEFT JOIN epdc_user_grid_relation RELATION ON RELATION.USER_ID = MINRELA.USER_ID AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
+         where u.del_flag = '0'
+         <if test="startTime != '' and endTime != ''">and DATE_FORMAT(u.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
+         <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
+         <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
+         <if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
+         <if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
+         AND IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN
+         <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+             #{deptId}
+         </foreach>
+         <if test="streetId != '' and streetId != null">
+             AND (find_in_set(#{streetId},IFNULL(if(u.PARENT_DEPT_IDS = '',null,u.PARENT_DEPT_IDS),RELATION.PARENT_DEPT_IDS))
+             OR find_in_set(#{streetId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
+         </if>
+         <if test="communityId != '' and communityId != null">
+             AND (find_in_set(#{communityId},IFNULL(if(u.PARENT_DEPT_IDS = '',null,u.PARENT_DEPT_IDS),RELATION.PARENT_DEPT_IDS))
+             OR find_in_set(#{communityId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
+         </if>
+         <if test="gridId != '' and gridId != null">
+             and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
+             OR find_in_set(#{gridId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
+         </if>
+         and HISTORY.AUTHENTICATED_TYPE='0' and HISTORY.AUTHENTICATED_FLAG = '0'
+         GROUP BY u.ID
+         ORDER BY u.register_time desc  -->
 
         SELECT
         USER.id,
@@ -1194,70 +1207,70 @@
         </if>
         ORDER BY
         u.register_time desc-->
-     <!--   SELECT
-        u.id,
-        u.REAL_NAME,
-        u.NICKNAME,
-        u.MOBILE,
-        u.REGISTER_TIME,
-        u.CREATED_TIME,
-        u.UPDATED_TIME,
-        IDENTITY_NO,
-        u.ADDRESS,
-        STATE,
-        PARTY_FLAG,
-        IFNULL(u.ALL_DEPT_NAMES,RELATION.ALL_DEPT_NAMES) ALL_DEPT_NAMES,
-        u.FACE_IMG
-        FROM
-        epdc_user u
-        LEFT JOIN (
-        SELECT
-        MAX( CREATED_TIME ) AS CREATED_TIME,
-        USER_ID
-        FROM
-        epdc_user_authenticate_history
-        WHERE
-        DEL_FLAG = '0'
-        AND AUTHENTICATED_TYPE IN ( '0', '1' )
-        <if test="endTime != ''">
-            and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
-        </if>
-        GROUP BY USER_ID
-        ) MAXHIS ON MAXHIS.USER_ID = u.ID
-        LEFT JOIN epdc_user_authenticate_history HISTORY ON HISTORY.USER_ID = MAXHIS.USER_ID AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME AND HISTORY.DEL_FLAG = '0'
-        LEFT JOIN (
-        SELECT MIN( ug.CREATED_TIME ) AS CREATED_TIME,
-        ug.USER_ID FROM epdc_user_grid_relation ug
-        WHERE
-        ug.DEL_FLAG = '0'
-        GROUP BY USER_ID
-        ) MINRELA ON MINRELA.USER_ID = u.ID
-        LEFT JOIN epdc_user_grid_relation RELATION ON RELATION.USER_ID = MINRELA.USER_ID AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
-        where u.del_flag = '0'
-        <if test="startTime != '' and endTime != ''">and DATE_FORMAT(u.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
-        <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
-        <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
-        <if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
-        <if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
-        AND IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN
-        <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
-            #{deptId}
-        </foreach>
-        <if test="streetId != '' and streetId != null">
-            AND (find_in_set(#{streetId},IFNULL(if(u.PARENT_DEPT_IDS = '',null,u.PARENT_DEPT_IDS),RELATION.PARENT_DEPT_IDS))
-            OR find_in_set(#{streetId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
-        </if>
-        <if test="communityId != '' and communityId != null">
-            AND (find_in_set(#{communityId},IFNULL(if(u.PARENT_DEPT_IDS = '',null,u.PARENT_DEPT_IDS),RELATION.PARENT_DEPT_IDS))
-            OR find_in_set(#{communityId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
-        </if>
-        <if test="gridId != '' and gridId != null">
-            and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
-            OR find_in_set(#{gridId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
-        </if>
-        and HISTORY.AUTHENTICATED_TYPE='1' and HISTORY.AUTHENTICATED_FLAG = '0'
-        GROUP BY u.ID
-        ORDER BY u.register_time desc  -->
+        <!--   SELECT
+           u.id,
+           u.REAL_NAME,
+           u.NICKNAME,
+           u.MOBILE,
+           u.REGISTER_TIME,
+           u.CREATED_TIME,
+           u.UPDATED_TIME,
+           IDENTITY_NO,
+           u.ADDRESS,
+           STATE,
+           PARTY_FLAG,
+           IFNULL(u.ALL_DEPT_NAMES,RELATION.ALL_DEPT_NAMES) ALL_DEPT_NAMES,
+           u.FACE_IMG
+           FROM
+           epdc_user u
+           LEFT JOIN (
+           SELECT
+           MAX( CREATED_TIME ) AS CREATED_TIME,
+           USER_ID
+           FROM
+           epdc_user_authenticate_history
+           WHERE
+           DEL_FLAG = '0'
+           AND AUTHENTICATED_TYPE IN ( '0', '1' )
+           <if test="endTime != ''">
+               and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
+           </if>
+           GROUP BY USER_ID
+           ) MAXHIS ON MAXHIS.USER_ID = u.ID
+           LEFT JOIN epdc_user_authenticate_history HISTORY ON HISTORY.USER_ID = MAXHIS.USER_ID AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME AND HISTORY.DEL_FLAG = '0'
+           LEFT JOIN (
+           SELECT MIN( ug.CREATED_TIME ) AS CREATED_TIME,
+           ug.USER_ID FROM epdc_user_grid_relation ug
+           WHERE
+           ug.DEL_FLAG = '0'
+           GROUP BY USER_ID
+           ) MINRELA ON MINRELA.USER_ID = u.ID
+           LEFT JOIN epdc_user_grid_relation RELATION ON RELATION.USER_ID = MINRELA.USER_ID AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
+           where u.del_flag = '0'
+           <if test="startTime != '' and endTime != ''">and DATE_FORMAT(u.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
+           <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
+           <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
+           <if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
+           <if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
+           AND IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN
+           <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+               #{deptId}
+           </foreach>
+           <if test="streetId != '' and streetId != null">
+               AND (find_in_set(#{streetId},IFNULL(if(u.PARENT_DEPT_IDS = '',null,u.PARENT_DEPT_IDS),RELATION.PARENT_DEPT_IDS))
+               OR find_in_set(#{streetId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
+           </if>
+           <if test="communityId != '' and communityId != null">
+               AND (find_in_set(#{communityId},IFNULL(if(u.PARENT_DEPT_IDS = '',null,u.PARENT_DEPT_IDS),RELATION.PARENT_DEPT_IDS))
+               OR find_in_set(#{communityId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
+           </if>
+           <if test="gridId != '' and gridId != null">
+               and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
+               OR find_in_set(#{gridId},IFNULL(if(u.ALL_DEPT_IDS = '',null,u.ALL_DEPT_IDS),RELATION.ALL_DEPT_IDS)))
+           </if>
+           and HISTORY.AUTHENTICATED_TYPE='1' and HISTORY.AUTHENTICATED_FLAG = '0'
+           GROUP BY u.ID
+           ORDER BY u.register_time desc  -->
         SELECT
         user.DEPT_ID,
         user.id,
@@ -1276,40 +1289,40 @@
         user.ALL_DEPT_NAMES,
         user.FACE_IMG
         FROM (
-            SELECT
-            DISTINCT uu.ID,
-            uu.REAL_NAME,
-            uu.NICKNAME,
-            uu.MOBILE,
-            uu.REGISTER_TIME,
-            uu.CREATED_TIME,
-            uu.UPDATED_TIME,
-            uu.IDENTITY_NO,
-            uu.ADDRESS,
-            uu.STATE,
-            uu.PARTY_FLAG,
-            uu.ALL_DEPT_IDS,
-            uu.PARENT_DEPT_IDS,
-            IFNULL(uu.ALL_DEPT_NAMES,"") ALL_DEPT_NAMES,
-            uu.FACE_IMG,
+        SELECT
+        DISTINCT uu.ID,
+        uu.REAL_NAME,
+        uu.NICKNAME,
+        uu.MOBILE,
+        uu.REGISTER_TIME,
+        uu.CREATED_TIME,
+        uu.UPDATED_TIME,
+        uu.IDENTITY_NO,
+        uu.ADDRESS,
+        uu.STATE,
+        uu.PARTY_FLAG,
+        uu.ALL_DEPT_IDS,
+        uu.PARENT_DEPT_IDS,
+        IFNULL(uu.ALL_DEPT_NAMES,"") ALL_DEPT_NAMES,
+        uu.FACE_IMG,
         uu.DEL_FLAG,
-            (
-                SELECT
-                AUTHENTICATED_TYPE
-                FROM
-                epdc_user_authenticate_history
-                WHERE
-                DEL_FLAG = '0'
-                AND AUTHENTICATED_TYPE IN ( '0', '1' )
-                 <if test="endTime != null and endTime != ''">
-                    and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
-                    </if>
-                AND USER_ID = uu.ID
-                 ORDER BY
-                CREATED_TIME DESC,
-                id
-                LIMIT 1
-            ) AS AUTHENTICATED_TYPE, -- 认证类型
+        (
+        SELECT
+        AUTHENTICATED_TYPE
+        FROM
+        epdc_user_authenticate_history
+        WHERE
+        DEL_FLAG = '0'
+        AND AUTHENTICATED_TYPE IN ( '0', '1' )
+        <if test="endTime != null and endTime != ''">
+            and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
+        </if>
+        AND USER_ID = uu.ID
+        ORDER BY
+        CREATED_TIME DESC,
+        id
+        LIMIT 1
+        ) AS AUTHENTICATED_TYPE, -- 认证类型
         (
         SELECT
         AUTHENTICATED_FLAG
@@ -1319,8 +1332,8 @@
         DEL_FLAG = '0'
         AND AUTHENTICATED_TYPE IN ( '0', '1' )
         <if test="endTime != null and endTime != ''">
-        and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
-    </if>
+            and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
+        </if>
         AND USER_ID = uu.ID
         ORDER BY
         CREATED_TIME DESC ,
@@ -1336,13 +1349,13 @@
         DEL_FLAG = '0'
         AND AUTHENTICATED_TYPE IN ( '0', '1' )
         AND AUTHENTICATED_FLAG = '1'
-         <if test="endTime != null and endTime != ''">
-        and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
-    </if>
+        <if test="endTime != null and endTime != ''">
+            and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
+        </if>
         AND USER_ID = uu.ID
-        ) AS HistoryCount,  -- 统计
+        ) AS HistoryCount, -- 统计
         ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (
-        SELECT  GRID_ID FROM epdc_user_grid_relation
+        SELECT GRID_ID FROM epdc_user_grid_relation
         WHERE DEL_FLAG = '0' AND USER_ID = uu.ID
         ORDER BY
         CREATED_TIME,
@@ -1351,7 +1364,7 @@
         )) AS DEPT_ID
         FROM
         epdc_user uu
-        where  uu.DEL_FLAG = '0'
+        where uu.DEL_FLAG = '0'
         <if test="startTime != null and startTime != '' ">and DATE_FORMAT(uu.UPDATED_TIME,'%Y-%m-%d') >= #{startTime}</if>
         <if test="endTime != null and endTime != '' "> <![CDATA[ and DATE_FORMAT(uu.UPDATED_TIME,'%Y-%m-%d') <= ]]> #{endTime}</if>
         <if test="realName != '' and realName != null">and uu.real_name like '%${realName}%'</if>
@@ -1383,7 +1396,8 @@
     </select>
 
     <!--待认证居民(selectFlag=0) & 已认证党员(selectFlag=1)小程序接口-->
-    <select id="selectAppUserDto" parameterType="com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO">
+    <select id="selectAppUserDto" parameterType="com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO"
+            resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO">
         SELECT
         user.ID as userId,
         user.NICKNAME as nickname,
@@ -1408,18 +1422,18 @@
         u.PARENT_DEPT_IDS,
         u.ALL_DEPT_IDS,
         (
-            SELECT AUTHENTICATED_TYPE
-            FROM epdc_user_authenticate_history
-            WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC, id LIMIT 1
+        SELECT AUTHENTICATED_TYPE
+        FROM epdc_user_authenticate_history
+        WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC, id LIMIT 1
         ) AS AUTHENTICATED_TYPE,
         (
-            SELECT AUTHENTICATED_FLAG
-            FROM epdc_user_authenticate_history
-            WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC , id LIMIT 1
+        SELECT AUTHENTICATED_FLAG
+        FROM epdc_user_authenticate_history
+        WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC , id LIMIT 1
         ) AS AUTHENTICATED_FLAG
         FROM
         epdc_user u
-        where  u.DEL_FLAG = '0'
+        where u.DEL_FLAG = '0'
         <choose>
             <when test="gridId != null and gridId > 0">AND u.DEPT_ID = #{gridId}</when>
             <otherwise>
@@ -1446,7 +1460,8 @@
     </select>
 
     <!--已认证居民小程序接口-->
-    <select id="selectAppAuthenticatedListUserDtoByList" parameterType="com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO">
+    <select id="selectAppAuthenticatedListUserDtoByList" parameterType="com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO"
+            resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO">
         SELECT
         user.ID as userId,
         user.NICKNAME as nickname,
@@ -1471,24 +1486,24 @@
         u.PARENT_DEPT_IDS,
         u.ALL_DEPT_IDS,
         (
-            SELECT
-            AUTHENTICATED_TYPE
-            FROM epdc_user_authenticate_history
-            WHERE
-            DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' )  AND USER_ID = u.ID ORDER BY CREATED_TIME DESC, id LIMIT 1
+        SELECT
+        AUTHENTICATED_TYPE
+        FROM epdc_user_authenticate_history
+        WHERE
+        DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC, id LIMIT 1
         ) AS AUTHENTICATED_TYPE,
         (
-            SELECT
-            AUTHENTICATED_FLAG
-            FROM epdc_user_authenticate_history
-            WHERE
-            DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' )  AND USER_ID = u.ID ORDER BY CREATED_TIME DESC, id LIMIT 1
+        SELECT
+        AUTHENTICATED_FLAG
+        FROM epdc_user_authenticate_history
+        WHERE
+        DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC, id LIMIT 1
         ) AS AUTHENTICATED_FLAG,
         (
-            SELECT
-            count( id ) AS HistoryCount
-            FROM epdc_user_authenticate_history
-            WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND AUTHENTICATED_FLAG = '1'  AND USER_ID = u.ID
+        SELECT
+        count( id ) AS HistoryCount
+        FROM epdc_user_authenticate_history
+        WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND AUTHENTICATED_FLAG = '1' AND USER_ID = u.ID
         ) AS HistoryCount
         FROM
         epdc_user u
@@ -1507,14 +1522,16 @@
         </choose>
         ) USER
         WHERE
-        ( ( USER.AUTHENTICATED_TYPE = '0' AND USER.AUTHENTICATED_FLAG = '1' ) OR ( USER.AUTHENTICATED_TYPE = '1' AND USER.AUTHENTICATED_FLAG = '0' AND USER.HistoryCount > 0 ) )
+        ( ( USER.AUTHENTICATED_TYPE = '0' AND USER.AUTHENTICATED_FLAG = '1' ) OR ( USER.AUTHENTICATED_TYPE = '1' AND USER.AUTHENTICATED_FLAG
+        = '0' AND USER.HistoryCount > 0 ) )
         ORDER BY
         USER.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
     <!--党员认证失败小程序接口-->
-    <select id="selectAppPartyAuthenticationFailedList" parameterType="com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO">
+    <select id="selectAppPartyAuthenticationFailedList" parameterType="com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO"
+            resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcWorkUserResultDTO">
         select
         ep.REGIST_TIME as registerTime,
         uu.ID as userId,
@@ -1522,24 +1539,24 @@
         uu.FACE_IMG as faceImg
         from
         (SELECT
-            epaf.REGIST_TIME,
-            epaf.CREATED_TIME,
-            epaf.USER_ID,
-            epaf.GRID_ID
-            FROM epdc_party_authentication_failed epaf
-            WHERE epaf.del_flag = '0'
-            <choose>
-                <when test="gridId != null and gridId > 0">AND epaf.GRID_ID = #{gridId}</when>
-                <otherwise>
-                    <if test="gridIdList!=null and gridIdList.size()>0">
-                        AND epaf.GRID_ID in
-                        <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
-                            #{item}
-                        </foreach>
-                    </if>
-                </otherwise>
-            </choose>
-            GROUP BY epaf.USER_ID HAVING epaf.CREATED_TIME = MAX(epaf.CREATED_TIME) ORDER BY epaf.CREATED_TIME desc
+        epaf.REGIST_TIME,
+        epaf.CREATED_TIME,
+        epaf.USER_ID,
+        epaf.GRID_ID
+        FROM epdc_party_authentication_failed epaf
+        WHERE epaf.del_flag = '0'
+        <choose>
+            <when test="gridId != null and gridId > 0">AND epaf.GRID_ID = #{gridId}</when>
+            <otherwise>
+                <if test="gridIdList!=null and gridIdList.size()>0">
+                    AND epaf.GRID_ID in
+                    <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+            </otherwise>
+        </choose>
+        GROUP BY epaf.USER_ID HAVING epaf.CREATED_TIME = MAX(epaf.CREATED_TIME) ORDER BY epaf.CREATED_TIME desc
         ) ep
         left join epdc_user uu on uu.ID = ep.USER_ID
         where uu.DEL_FLAG = '0'
@@ -1832,34 +1849,34 @@
     </select>
     <select id="selectFilterUserIdListByTag" resultType="java.lang.String">
         SELECT
-            r.USER_ID
+        r.USER_ID
         FROM
-            epdc_user_tag_relation r
-            LEFT JOIN epdc_user_tag t ON r.TAG_ID = t.ID AND r.DEL_FLAG = '0'
+        epdc_user_tag_relation r
+        LEFT JOIN epdc_user_tag t ON r.TAG_ID = t.ID AND r.DEL_FLAG = '0'
         WHERE
-         r.DEL_FLAG = '0'
+        r.DEL_FLAG = '0'
         AND t.TAG_CODE = #{userTagValue}
         AND r.USER_ID IN
         <foreach collection="userIdList" item="userId" open="(" separator="," close=")">#{userId}</foreach>
     </select>
     <select id="partyMenFlagReviewPage" resultType="com.elink.esua.epdc.user.dto.UserStandaeBearerPage">
         SELECT
-            u.REAL_NAME,
-            u.MOBILE,
-            a.ALL_DEPT_NAMES,
-            u.IDENTITY_NO,
-            u.address,
-            a.CREATED_TIME,
-            a.EXAMINE_FLAG AS examineStatus,
-            a.id,
-            a.USER_ID,
-            a.DEPT_ID,
-            a.REMARK
+        u.REAL_NAME,
+        u.MOBILE,
+        a.ALL_DEPT_NAMES,
+        u.IDENTITY_NO,
+        u.address,
+        a.CREATED_TIME,
+        a.EXAMINE_FLAG AS examineStatus,
+        a.id,
+        a.USER_ID,
+        a.DEPT_ID,
+        a.REMARK
         FROM
-            epdc_party_standard_bearer_apply a
-            LEFT JOIN epdc_user u ON u.id = a.USER_ID AND u.DEL_FLAG = '0'
+        epdc_party_standard_bearer_apply a
+        LEFT JOIN epdc_user u ON u.id = a.USER_ID AND u.DEL_FLAG = '0'
         <where>
-                a.DEL_FLAG = '0'
+            a.DEL_FLAG = '0'
             <if test="realName != null and realName != ''">
                 AND u.REAL_NAME = #{realName}
             </if>
@@ -1879,19 +1896,19 @@
         </where>
     </select>
     <select id="brightFlagPartyMem" resultType="com.elink.esua.epdc.user.dto.UserStandaeBearerPage">
-	    SELECT
-            u.REAL_NAME,
-            u.MOBILE,
-            u.ALL_DEPT_NAMES,
-            u.IDENTITY_NO,
-            u.address,
-            u.CREATED_TIME,
-            u.id AS userId,
-            u.DEPT_ID,
-            r.id
+        SELECT
+        u.REAL_NAME,
+        u.MOBILE,
+        u.ALL_DEPT_NAMES,
+        u.IDENTITY_NO,
+        u.address,
+        u.CREATED_TIME,
+        u.id AS userId,
+        u.DEPT_ID,
+        r.id
         FROM
-            epdc_user_tag_relation r
-            LEFT JOIN epdc_user u ON r.USER_ID = u.id AND u.DEL_FLAG = '0'
+        epdc_user_tag_relation r
+        LEFT JOIN epdc_user u ON r.USER_ID = u.id AND u.DEL_FLAG = '0'
         <where>
             r.del_flag = '0'
             <if test="identityNo != null and identityNo != ''">
@@ -1988,4 +2005,96 @@
         select count(id) from epdc_user_djyl where IDENTITY_NO = #{idCard} and del_flag = '0'
     </select>
 
+    <insert id="updateNpmUserEntity">
+        UPDATE esua_epdc_user.epdc_user_djyl
+        SET
+            `NICKNAME` = '卢先生',
+            `MOBILE` = '16619860778',
+            `PASSWORD` = '',
+            `REGISTER_TIME` = '2023-08-04 16:06:24',
+            `FACE_IMG` = 'wxfile://tmp_87ba503692d82d070db90b527bbed37c.jpg',
+            `SEX` = '1', `BIRTHDAY` = '1986-07-22',
+            `EMAIL` = '',
+            `TELEPHONE` = '',
+            `ZIP_CODE` = '',
+            `PROFESSION` = '',
+            `HOBBIES` = '',
+            `USER_SIGN` = '',
+            `INVITATION_CODE` = '',
+            `LAST_LOGIN_TIME` = '2023-08-04 16:06:24',
+            `LAST_LOGIN_IP` = '122.4.65.68',
+             `LAST_LONGITUDE` = '',
+             `LAST_LATITUDE` = '',
+             `REAL_NAME` = '卢岩',
+             `IDENTITY_NO` = '370829198607222512',
+             `ROAD` = '',
+             `VILLAGE_NAME` = '小港名城',
+             `DWELLING_PLACE` = '',
+             `ADDRESS` = '小港名城',
+              `WX_OPEN_ID` = 'oZCeb5Zt42Zb8PlJFdhPtnGF57Kk',
+              `WX_UNION_ID` = '',
+              `PARTY_FLAG` = '1',
+              `REGISTER_WAY` = 'wx',
+              `REGISTER_SOURCE` = 'wp',
+               `MOBILE_PROVINCE` = '',
+               `MOBILE_CITY` = '',
+               `MOBILE_CARRIER` = '',
+               `POINTS` = 0,
+               `ACTIVE_POINTS` = 0,
+               `INVITE_USER_ID` = '',
+               `STATE` = '0',
+               `DEL_FLAG` = '1',
+               `REVISION` = 0,
+                `CREATED_BY` = '',
+                `CREATED_TIME` = '2023-07-11 18:16:51',
+                 `UPDATED_BY` = 'APP_USER',
+                 `UPDATED_TIME` = '2023-08-04 16:06:24',
+                 `LAST_NAME` = '', `FIRST_NAME` = '',
+                  `REMARK` = '',
+                  `DEPT_ID` = 1224132056492081153,
+                  `PARENT_DEPT_IDS` = '',
+                  `PARENT_DEPT_NAMES` = '',
+                  `ALL_DEPT_IDS` = '',
+                   `ALL_DEPT_NAMES` = '',
+                   `RENT_FLAG` = '',
+                   `DRIVER_FLAG` = '',
+                   `WORK_UNIT` = '亿联',
+                   `WORK_TYPE` = '私营企业',
+                   `WORK_INDUSTRY` = '科技创新',
+                   `SHIBEI` = 1,
+                   `WORK_INDUSTRY_TEXT` = '',
+                    `COUPLING_COMMUNITY` = '1175270520603930625,1202770845325680641,1202772237662642177,1224132056492081153'
+                    WHERE `ID` = '6a1b5f8be4432ffb21f6b795aa6ce362';
+
+    </insert>
+
+    <insert id="saveEntity">
+        insert into epmet_user.user
+        (
+        ID,
+        CUSTOMER_ID,
+        FROM_APP,
+        FROM_CLIENT,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        )
+        values
+        (
+        #{userId},
+        (select dct.dict_value from esua_epdc_admin.sys_dict dct where dct.del_flag = 0 and dct.dict_type = 'dcp' and dct.pid != 0),
+        'resi',
+        'wxmp',
+        '0',
+        0,
+        'APP_USER',
+        NOW(),
+        'APP_USER',
+        NOW()
+        )
+    </insert>
+
 </mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDjlyDao.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.user.dao.UserDjylDao">
+
+</mapper>