liupeng il y a 5 ans
Parent
commit
65e29088a9

+ 17 - 17
code/sapparent/sapservice/src/main/java/org/fouram/service/SapReportService.java

@@ -54,23 +54,23 @@ public class SapReportService extends BaseService {
 		this.saveSapCourses(headers, userIds);
 		this.saveSapEducation(headers, userIds);
 		this.saveSapInsideWorkExperience(headers, userIds);
-		this.saveSapLanguages(headers, personIds, userIds);
+		this.saveSapLanguages(headers, userIds);
 		this.saveSapOverallPerformance(headers, userIds);
 		this.saveSapEmpJob(headers, userIds);
 		this.saveSapOutsideWorkExperience(headers, userIds);
 		this.saveSapEmpEmployment(headers, personIds);
 		this.saveSapEmpJobRelationships(headers, userIds);
-		this.saveSapPerEmail(headers, personIds, userIds);
-		this.saveSapPerGlobalInfoCHN(headers, personIds, userIds);
-		this.saveSapPerNationalId(headers, personIds, userIds);
-		this.saveSapPerPersonal(headers, personIds, userIds);
-		this.saveSapPerPerson(headers, personIds, userIds);
-		this.saveSapPerPhone(headers, personIds, userIds);
-		this.saveSapPerSocialAccount(headers, personIds, userIds);
+		this.saveSapPerEmail(headers, personIds);
+		this.saveSapPerGlobalInfoCHN(headers, personIds);
+		this.saveSapPerNationalId(headers, personIds);
+		this.saveSapPerPersonal(headers, personIds);
+		this.saveSapPerPerson(headers, personIds);
+		this.saveSapPerPhone(headers, personIds);
+		this.saveSapPerSocialAccount(headers, personIds);
 	}
 
 // 基本信息	PerPerson,PerPersonal
-	public void saveSapPerPerson(HttpHeaders headers, String personIds, String userIds) throws Exception {
+	public void saveSapPerPerson(HttpHeaders headers, String personIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerPerson", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerPerson?$filter=personIdExternal in %s&$format=json&$expand=customString1Nav";
@@ -92,7 +92,7 @@ public class SapReportService extends BaseService {
 	}
 
 // 基本信息	PerPerson,PerPersonal
-	public void saveSapPerPersonal(HttpHeaders headers, String personIds, String userIds) throws Exception {
+	public void saveSapPerPersonal(HttpHeaders headers, String personIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerPersonal", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerPersonal?$filter=personIdExternal in %s&$format=json&$expand=maritalStatusNav";
@@ -124,7 +124,7 @@ public class SapReportService extends BaseService {
 	}
 
 // 个人信息	PerGlobalInfoCHN
-	public void saveSapPerGlobalInfoCHN(HttpHeaders headers, String personIds, String userIds) throws Exception {
+	public void saveSapPerGlobalInfoCHN(HttpHeaders headers, String personIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerGlobalInfoCHN", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerGlobalInfoCHN?$filter=personIdExternal in %s&$format=json";
@@ -150,7 +150,7 @@ public class SapReportService extends BaseService {
 	}
 
 // 国家身份信息	PerNationalId
-	public void saveSapPerNationalId(HttpHeaders headers, String personIds, String userIds) throws Exception {
+	public void saveSapPerNationalId(HttpHeaders headers, String personIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerNationalId", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerNationalId?$filter=personIdExternal in %s&$format=json&$expand=countryNav";
@@ -172,7 +172,7 @@ public class SapReportService extends BaseService {
 	}
 
 // 邮件信息	PerEmail
-	public void saveSapPerEmail(HttpHeaders headers, String personIds, String userIds) throws Exception {
+	public void saveSapPerEmail(HttpHeaders headers, String personIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerEmail", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerEmail?$filter=personIdExternal in %s&$format=json&$expand=emailTypeNav";
@@ -195,7 +195,7 @@ public class SapReportService extends BaseService {
 	}
 
 // 通讯信息	PerPhone
-	public void saveSapPerPhone(HttpHeaders headers, String personIds, String userIds) throws Exception {
+	public void saveSapPerPhone(HttpHeaders headers, String personIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerPhone", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerPhone?$filter=personIdExternal in %s&$format=json&$expand=phoneTypeNav";
@@ -217,7 +217,7 @@ public class SapReportService extends BaseService {
 	}
 
 // 社交账号	PerSocialAccount
-	public void saveSapPerSocialAccount(HttpHeaders headers, String personIds, String userIds) throws Exception {
+	public void saveSapPerSocialAccount(HttpHeaders headers, String personIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerSocialAccount", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerSocialAccount?$filter=personIdExternal in %s&$format=json&$expand=domainNav";
@@ -458,11 +458,11 @@ public class SapReportService extends BaseService {
 	}
 
 	// 语言能力 Background_Languages
-	public void saveSapLanguages(HttpHeaders headers, String personIds, String userIds) throws Exception {
+	public void saveSapLanguages(HttpHeaders headers, String userIds) throws Exception {
 		delete("SapReportMapper.deleteSapLanguages", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/Background_Languages?$filter=userId in %s&$format=json&$expand=languageNav,speakingProfNav,readingProfNav,writingProfNav";
-		url = String.format(url, personIds);
+		url = String.format(url, userIds);
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();