From c11cd7221fa1eb95d287e2e3485a269f1b01f03b Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 29 Apr 2020 10:24:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/AutoFailedDetailResultDTO.java | 3 +- .../result/RejectedDetailResultDTO.java | 3 +- .../impl/PartyMemberConfirmServiceImpl.java | 36 ++++++++++--------- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AutoFailedDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AutoFailedDetailResultDTO.java index 7000c5f240..41719226dc 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AutoFailedDetailResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AutoFailedDetailResultDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.List; /** * @author zhaoqifeng @@ -45,5 +46,5 @@ public class AutoFailedDetailResultDTO implements Serializable { /** * 自动审核失败原因以逗号隔开 */ - private String failedReason; + private List failedReason; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/RejectedDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/RejectedDetailResultDTO.java index 275490c991..9018117429 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/RejectedDetailResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/RejectedDetailResultDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.List; /** * @author zhaoqifeng @@ -62,5 +63,5 @@ public class RejectedDetailResultDTO implements Serializable { /** * 自动审核失败的原因 */ - private String failedReason; + private List failedReason; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 50658337d2..6718a6fb72 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -372,27 +372,29 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService resultDTO.setIdCard(partyMemberInfo.getIdCard()); resultDTO.setMobile(partyMemberInfo.getMobile()); resultDTO.setAddress(partyMemberInfo.getStreet() + partyMemberInfo.getEstate() + partyMemberInfo.getBuilding()); - String failedReason = ""; + List failedReason = new ArrayList<>(); if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) { PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId()); resultDTO.setCertifyTime(autoEntity.getContrastTime().getTime()); if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) { - failedReason = failedReason + "手机号匹配,"; + failedReason.add("手机号匹配"); } else { - failedReason = failedReason + "手机号未匹配,"; + failedReason.add("手机号未匹配"); } if (PartyMemberConstant.SAME.equals(autoEntity.getIdCardResult())) { - failedReason = failedReason + "身份证匹配,"; + failedReason.add("身份证匹配"); } else { - failedReason = failedReason + "身份证未匹配,"; + failedReason.add("身份证未匹配"); } if (PartyMemberConstant.SAME.equals(autoEntity.getNameResult())) { - failedReason = failedReason + "姓名匹配"; + failedReason.add("姓名匹配"); } else { - failedReason = failedReason + "姓名未匹配"; + failedReason.add("姓名未匹配"); } } else { - failedReason = "手机号未匹配,身份证未匹配，姓名未匹配"; + failedReason.add("手机号未匹配"); + failedReason.add("身份证未匹配"); + failedReason.add("姓名未匹配"); resultDTO.setCertifyTime(partyMemberInfo.getUpdatedTime().getTime()); } resultDTO.setFailedReason(failedReason); @@ -423,26 +425,28 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService resultDTO.setExtraOrganization(partyMemberInfo.getExtraOrganization()); resultDTO.setContactMobile(partyMemberInfo.getExtraCertifierMobile() == null ? "" : partyMemberInfo.getExtraCertifierMobile()); resultDTO.setContactPeople(partyMemberInfo.getExtraCertifierName() == null ? "" : partyMemberInfo.getExtraCertifierName()); - String failedReason =""; + List failedReason = new ArrayList<>(); if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) { PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId()); if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) { - failedReason = failedReason + "手机号匹配,"; + failedReason.add("手机号匹配"); } else { - failedReason = failedReason + "手机号未匹配,"; + failedReason.add("手机号未匹配"); } if (PartyMemberConstant.SAME.equals(autoEntity.getIdCardResult())) { - failedReason = failedReason + "身份证匹配,"; + failedReason.add("身份证匹配"); } else { - failedReason = failedReason + "身份证未匹配,"; + failedReason.add("身份证未匹配"); } if (PartyMemberConstant.SAME.equals(autoEntity.getNameResult())) { - failedReason = failedReason + "姓名匹配"; + failedReason.add("姓名匹配"); } else { - failedReason = failedReason + "姓名未匹配"; + failedReason.add("姓名未匹配"); } } else { - failedReason = "手机号未匹配,身份证未匹配，姓名未匹配"; + failedReason.add("手机号未匹配"); + failedReason.add("身份证未匹配"); + failedReason.add("姓名未匹配"); } resultDTO.setFailedReason(failedReason); //获取人工审核信息