diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserTagEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserTagEnum.java new file mode 100644 index 000000000..0fbd4834d --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserTagEnum.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.commons.tools.enums; + +/** + * @Auther: yinzuomei + * @Date: 2019/12/17 19:11 + * @Description: 用户身份枚举类 + */ +public enum UserTagEnum { + /** + * 党员 + */ + PARTY_MEMBER("partymember"), + + /** + * 志愿者 + */ + VOLUNTEER("volunteer"); + + private String value; + + UserTagEnum(String value) { + this.value = value; + } + + public String value() { + return this.value; + } +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagDTO.java index 351b1856e..2e40c8703 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagDTO.java @@ -36,6 +36,10 @@ public class UserTagDTO implements Serializable { private String id; private String tagName; + /** + * 标签编码 + */ + private String tagCode; private String tagDesc; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagDao.java index cccd1945c..136991b23 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserTagDao.java @@ -29,5 +29,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface UserTagDao extends BaseDao { - -} \ No newline at end of file + + /** + * @param tagCode + * @return com.elink.esua.epdc.entity.UserTagEntity + * @Author yinzuomei + * @Description 根据标签编码查询信息 + * @Date 2019/12/17 19:17 + **/ + UserTagEntity selectByTagCode(String tagCode); +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserTagEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserTagEntity.java index 4c2e99203..a108b6b9e 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserTagEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserTagEntity.java @@ -45,6 +45,12 @@ public class UserTagEntity extends BaseEpdcEntity { * 标签名 */ private String tagName; + + /** + * 标签编码 + */ + private String tagCode; + /** * 标签描述 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 737bc13dd..7db3cc563 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.UserSexEnum; +import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; @@ -34,10 +35,7 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.UserFieldConsant; -import com.elink.esua.epdc.dao.PartyAuthenticationFailedDao; -import com.elink.esua.epdc.dao.PartyMembersDao; -import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao; -import com.elink.esua.epdc.dao.UserDao; +import com.elink.esua.epdc.dao.*; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; @@ -92,7 +90,10 @@ public class UserServiceImpl extends BaseServiceImpl implem private AdminFeignClient adminFeignClient; @Autowired private PartyAuthenticationFailedDao partyAuthenticationFailedDao; - + @Autowired + private UserTagDao userTagDao; + @Autowired + private UserTagRelationDao userTagRelationDao; @Override public PageData page(Map params) { this.verifyParams(params); @@ -552,6 +553,12 @@ public class UserServiceImpl extends BaseServiceImpl implem this.partyMembersDao.update(partyMembersEntity, partyUpdate); userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value()); userDto.setPartyFlag(YesOrNoEnum.YES.value());//是否是党员(0-否,1-是) 认证失败:0 + //党员认证成功需要插入epdc_user_tag_relation表 + UserTagEntity userTagEntity=userTagDao.selectByTagCode(UserTagEnum.PARTY_MEMBER.value()); + UserTagRelationEntity userTagRelationEntity=new UserTagRelationEntity(); + userTagRelationEntity.setTagId(userTagEntity.getId()); + userTagRelationEntity.setUserId(userDto.getId()); + userTagRelationDao.insert(userTagRelationEntity); } //插入用户认证历史表 userAuthenticateHistoryEntity.setUserId(userId); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml index 22ebfc9b6..aab9d9d05 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml @@ -6,6 +6,7 @@ + @@ -15,5 +16,11 @@ - - \ No newline at end of file + + +