liupeng hace 4 años
padre
commit
a82a14037f

+ 1 - 1
code/sapparent/sapservice/src/main/java/org/fouram/entity/SapPerPersonRelationship.java

@@ -21,7 +21,7 @@ public class SapPerPersonRelationship implements Serializable {
 	private String relatedPersonId;
 	private String lastName;
 	private String firstName;
-	private Integer relationshipType;
+	private String relationshipType;
 	private String relationshipTypeName;
 	private String dateOfBirth;
 }

+ 42 - 0
code/sapparent/sapservice/src/main/java/org/fouram/enums/RelationshipTypeEnum.java

@@ -0,0 +1,42 @@
+package org.fouram.enums;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum RelationshipTypeEnum {
+
+	CHILD("29111", 1, "子女"), SPOUSE("29102", 2, "配偶"), DAD("29104", 3, "父亲"), MOM("29105", 3, "母亲");
+
+	private final String sapCode;
+	private final Integer myCode;
+	private final String desc;
+
+	RelationshipTypeEnum(String sapCode, Integer myCode, String desc) {
+		this.sapCode = sapCode;
+		this.myCode = myCode;
+		this.desc = desc;
+	}
+
+	public String getSapCode() {
+		return sapCode;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public Integer getMyCode() {
+		return myCode;
+	}
+
+	public static RelationshipTypeEnum getEnumBySapCode(String sapCode) {
+		if (StringUtils.isBlank(sapCode)) {
+			return null;
+		}
+		for (RelationshipTypeEnum instance : values()) {
+			if (instance.getSapCode() == sapCode || instance.getSapCode().equals(sapCode)) {
+				return instance;
+			}
+		}
+		return null;
+	}
+}

+ 3 - 1
code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -36,6 +36,7 @@ import org.fouram.entity.SapUser;
 import org.fouram.entity.WxUser;
 import org.fouram.enums.CardTypeEnum;
 import org.fouram.enums.DelFlagEnum;
+import org.fouram.enums.RelationshipTypeEnum;
 import org.fouram.enums.SapUserResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -562,7 +563,8 @@ public class SapUserService extends BaseService {
 		for (SapPerPersonRelationship relationship : relationships) {
 			AddFamilyDTO family = AddFamilyDTO.builder().birthDate(relationship.getDateOfBirth())
 					.name(relationship.getLastName() + relationship.getFirstName())
-					.relation(relationship.getRelationshipType()).build();
+					.relation(RelationshipTypeEnum.getEnumBySapCode(relationship.getRelationshipType()).getMyCode())
+					.build();
 			familyList.add(family);
 		}
 		UploadUpdateEmpDTO reqdata = UploadUpdateEmpDTO.builder().businessUnit(user.getFirstOrgName())