From a9b6f9dd8f3c1b1cfddf43c4cf6a5e6ff8af1477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Mon, 23 Dec 2019 14:51:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=A1=A8=E6=96=B0=E5=A2=9E=E8=AE=A4=E8=AF=81=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=20=20=20=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91=E7=AB=AF?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98=20=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF=E8=AE=A4=E8=AF=81=E5=B1=85=E6=B0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/constant/AuthenticatedConsant.java | 15 +++++++++++++++ .../entity/UserAuthenticateHistoryEntity.java | 5 +++++ .../esua/epdc/service/impl/UserServiceImpl.java | 3 +++ 3 files changed, 23 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/AuthenticatedConsant.java diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/AuthenticatedConsant.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/AuthenticatedConsant.java new file mode 100644 index 000000000..1fd594cc7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/AuthenticatedConsant.java @@ -0,0 +1,15 @@ +package com.elink.esua.epdc.constant; + +/** + * @author: qushutong + * @Date: 2019/12/23 14:12 + * @Description: 认证类别(0 - 居民认证 ， 1 - 党员认证 ， 2 - 志愿者认证) + */ +public interface AuthenticatedConsant { + + String userAuth = "0"; + + String partyAuth = "1"; + + String volunteerAuth = "2"; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java index fa3a1693d..d8c063b5e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java @@ -68,4 +68,9 @@ public class UserAuthenticateHistoryEntity extends BaseEpdcEntity { */ private String remark; + /** + * 认证类别(0-居民认证，1-党员认证，2-志愿者认证) + */ + private String authenticatedType; + } \ No newline at end of file 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 353d612f0..b83165c32 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 @@ -33,6 +33,7 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; 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.AuthenticatedConsant; import com.elink.esua.epdc.constant.UserFieldConsant; import com.elink.esua.epdc.dao.PartyAuthenticationFailedDao; import com.elink.esua.epdc.dao.PartyMembersDao; @@ -559,6 +560,7 @@ public class UserServiceImpl extends BaseServiceImpl implem userAuthenticateHistoryEntity.setRealName(userDto.getRealName()); userAuthenticateHistoryEntity.setAddress(userDto.getAddress()); userAuthenticateHistoryEntity.setRemark(userDto.getRemark()); + userAuthenticateHistoryEntity.setAuthenticatedType(AuthenticatedConsant.partyAuth); // 新维护的 认证类别(0-居民认证，1-党员认证，2-志愿者认证) userAuthenticateHistoryDao.insert(userAuthenticateHistoryEntity); } else { if (oldEntity.getState().equals(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value())) { @@ -645,6 +647,7 @@ public class UserServiceImpl extends BaseServiceImpl implem authenticateHistoryEntity.setAddress(userDto.getAddress()); authenticateHistoryEntity.setAuthenticatedFlag(formDTO.getAuthenticatedFlag());//是否认证通过 0未通过1通过 //authenticateHistoryEntity.setRemark(userDto.getRemark()); + authenticateHistoryEntity.setAuthenticatedType(AuthenticatedConsant.userAuth); // 新维护的 认证类别(0-居民认证，1-党员认证，2-志愿者认证) authenticateHistoryEntity.setRemark(formDTO.getRemark()); //审核不通过的原因 - 2019.12.05.zy userAuthenticateHistoryDao.insert(authenticateHistoryEntity); }