认证历史记录表新增认证类别 修改居民端认证党员 业务端认证居民

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";
+}

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;
+
 }

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<UserDao, UserEntity> 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<UserDao, UserEntity> 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);
         }