diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyAuthenticationFailedDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyAuthenticationFailedDTO.java index 70b09a96b..11cf253df 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyAuthenticationFailedDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyAuthenticationFailedDTO.java @@ -118,11 +118,6 @@ public class PartyAuthenticationFailedDTO implements Serializable { */ private Integer state; - /** - * 处理意见 - */ - private String processingOpinions; - /** * 乐观锁 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java index dc99def7c..1543de1a2 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java @@ -22,4 +22,9 @@ public class EpdcAppAuthenticateResidentFormDTO implements Serializable { */ @NotBlank(message = "用户ID不能为空") private String userId; + + /** + * 审核不通过的原因 - 2019.12.05.zy + */ + private String remark; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAuthenticateHistoryResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAuthenticateHistoryResultDTO.java index 9f2a11a2f..7a4fa6670 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAuthenticateHistoryResultDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAuthenticateHistoryResultDTO.java @@ -37,4 +37,9 @@ public class EpdcAuthenticateHistoryResultDTO implements Serializable { */ private String time; + /** + * 审核备注 + */ + private String remake; + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java index d5d2e15ed..2691b5b3f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java @@ -98,11 +98,6 @@ public class PartyAuthenticationFailedEntity extends BaseEpdcEntity { */ private Integer state; - /** - * 处理意见 - */ - private String processingOpinions; - /** * 用户ID */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java index cca915878..872332532 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java @@ -82,8 +82,6 @@ public class PartyAuthenticationFailedExcel { @Excel(name = "状态 0-认证失败") private Integer state; - @Excel(name = "处理意见") - private String processingOpinions; @Excel(name = "乐观锁") private Integer revision; 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 f9b80d176..f06eb84af 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 @@ -588,6 +588,7 @@ public class UserServiceImpl extends BaseServiceImpl implem } UserDTO userDTO = this.get(formDTO.getUserId()); if (null != userDTO) { + userDTO.setRemark(formDTO.getRemark());//审核不通过的原因 - 2019.12.05.zy if (YesOrNoEnum.NO.value().equals(formDTO.getAuthenticatedFlag())) {//不通过 userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value()); } else if (YesOrNoEnum.YES.value().equals(formDTO.getAuthenticatedFlag())) {//通过 @@ -604,6 +605,7 @@ public class UserServiceImpl extends BaseServiceImpl implem authenticateHistoryEntity.setAddress(userDTO.getAddress()); authenticateHistoryEntity.setAuthenticatedFlag(formDTO.getAuthenticatedFlag());//是否认证通过 0未通过1通过 //authenticateHistoryEntity.setRemark(userDTO.getRemark()); + authenticateHistoryEntity.setRemark(formDTO.getRemark()); //审核不通过的原因 - 2019.12.05.zy userAuthenticateHistoryDao.insert(authenticateHistoryEntity); } return new Result(); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml index 20eb7280e..7b7390515 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml @@ -21,7 +21,6 @@ - diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserAuthenticateHistoryDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserAuthenticateHistoryDao.xml index ff9186bb2..369846925 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserAuthenticateHistoryDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserAuthenticateHistoryDao.xml @@ -48,6 +48,7 @@ m.ADDRESS as address, m.REAL_NAME as realName, m.AUTHENTICATED_FLAG as authenticatedFlag, + m.REMARK as remake, DATE_FORMAT(m.CREATED_TIME,'%Y-%c-%d %H:%i:%s') as `time` from epdc_user_authenticate_history m where m.DEL_FLAG='0'