Merge remote-tracking branch 'origin/dev_govgrid' into dev

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<String> failedReason;
 }

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<String> failedReason;
 }

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<String> 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<String> 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);
 		//获取人工审核信息