liupeng 4 年之前
父节点
当前提交
0d0eaebfa5

+ 5 - 0
code/sapparent/sapservice/src/main/java/org/fouram/service/SapPerPersonRelationshipService.java

@@ -1,6 +1,7 @@
 package org.fouram.service;
 
 import java.util.Iterator;
+import java.util.List;
 
 import org.fouram.core.base.service.BaseService;
 import org.fouram.core.util.JsonNodeUtil;
@@ -37,4 +38,8 @@ public class SapPerPersonRelationshipService extends BaseService {
 			}
 		}
 	}
+
+	public List<SapPerPersonRelationship> findListByPersonId(String personId) {
+		return null;
+	}
 }

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

@@ -23,10 +23,12 @@ import org.fouram.dto.input.GetIngoreListDTO;
 import org.fouram.dto.input.GetToBeConfirmedListDTO;
 import org.fouram.dto.input.UploadModifyEmpDTO;
 import org.fouram.dto.input.UploadUpdateEmpDTO;
+import org.fouram.dto.input.UploadUpdateEmpDTO.AddFamilyDTO;
 import org.fouram.dto.output.GetIngoreListOutput;
 import org.fouram.dto.output.GetToBeConfirmedListOutput;
 import org.fouram.entity.SapMessageUser;
 import org.fouram.entity.SapOrg;
+import org.fouram.entity.SapPerPersonRelationship;
 import org.fouram.entity.SapUser;
 import org.fouram.entity.WxUser;
 import org.fouram.enums.CardTypeEnum;
@@ -67,6 +69,8 @@ public class SapUserService extends BaseService {
 	@Autowired
 	private SapEmpEmploymentService sapEmpEmploymentService;
 	@Autowired
+	private SapPerPersonRelationshipService relationshipService;
+	@Autowired
 	private SapEmpEmploymentTerminationService sapEmpEmploymentTerminationService;
 
 	public void saveOrUpdateSapUsers() throws Exception {
@@ -566,10 +570,19 @@ public class SapUserService extends BaseService {
 	}
 
 	private void uploadEmpUserDetailInfo(SapUser user, Integer type, boolean devFlag) throws Exception {
+		List<SapPerPersonRelationship> relationships = relationshipService.findListByPersonId(user.getPersonId());
+		List<AddFamilyDTO> familyList = Lists.newArrayList();
+		for(SapPerPersonRelationship relationship : relationships) {
+			AddFamilyDTO family = AddFamilyDTO.builder().birthDate(relationship.getDateOfBirth())
+					.name(relationship.getLastName() + relationship.getFirstName()).build();
+			familyList.add(family);
+		}
+		
 		UploadUpdateEmpDTO reqdata = UploadUpdateEmpDTO.builder().username(user.getName())
 				.entryDate(user.getStartDate()).resignDate(user.getEndDate()).cardId(user.getCardId())
 				.cardType(CardTypeEnum.getEnumBySapCode(user.getCardType()).getMyCode()).jobNumber(user.getJobNumber())
-				.build();
+				.familyList(familyList).build();
+
 		String url = "http://cmcadmin.info666.com/hr/emp/updateEmpInfo";
 		if (!devFlag) {
 			url = "https://manage.inet.cmcinc.cn/hr/emp/updateEmpInfo";