liupeng 5 years ago
parent
commit
84c1233c65

+ 12 - 1
code/sapparent/sapservice/src/main/java/org/fouram/core/util/JsonNodeUtil.java

@@ -4,10 +4,21 @@ import com.fasterxml.jackson.databind.JsonNode;
 
 public class JsonNodeUtil {
 	
+	public static String getValue(JsonNode userNode, String key) {
+		String value = userNode.get(key).asText().trim();
+		if(Tools.isEmpty(value)) {
+			return "";
+		}
+		return value;
+	}
+	
 	public static String getValue(JsonNode userNode, String key1, String key2) {
 		String value = null;
 		if (userNode.get(key1) != null && userNode.get(key1).get(key2) != null) {
-			value = userNode.get(key1).get(key2).asText().trim();// 是否管理层
+			value = userNode.get(key1).get(key2).asText().trim();
+		}
+		if(Tools.isEmpty(value)) {
+			return "";
 		}
 		return value;
 	}

+ 5 - 1
code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapReportMapper.xml

@@ -49,6 +49,10 @@
 			#{seniority},#{endDate},#{okToRehire},#{salaryEndDate},#{benefitsEndDate},#{leavingReasonCode})
 	</insert>
 	
+	<delete id="deleteSapEmpJob">
+		delete from sapempjob
+	</delete>
+	
 	<insert id="saveSapEmpJob">
 		insert into sapempjob(userId,positionName,positionEntryDate,companyName,businessUnitName,
 			divisionName,departmentName,teamName,locationName,managerId,jobCodeName,
@@ -70,7 +74,7 @@
 	<insert id="saveSapOutsideWorkExperience">
 		insert into sapoutsideworkexperience(userId,startDate,endDate,employer,businessType,
 			department,position,leavingReason,immediateSupervisorName,contactInformation) 
-		values (#{userId},#{startDate}#{endDate},#{employer},#{businessType},
+		values (#{userId},#{startDate},#{endDate},#{employer},#{businessType},
 			#{department},#{position},#{leavingReason},#{immediateSupervisorName},#{contactInformation})
 	</insert>
 	

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

@@ -56,10 +56,9 @@ public class SapReportService extends BaseService {
 //		this.saveSapInsideWorkExperience(headers, userIds);
 //		this.saveSapLanguages(headers, personIds, userIds);
 //		this.saveSapOverallPerformance(headers, userIds);
+//		this.saveSapEmpJob(headers, userIds);
 
-		this.saveSapEmpJob(headers, userIds);
-
-//		this.saveSapOutsideWorkExperience(headers, userIds);
+		this.saveSapOutsideWorkExperience(headers, userIds);
 //		this.saveSapEmpEmployment(headers, personIds, userIds);
 //		this.saveSapEmpJobRelationships(headers, userIds);
 //		this.saveSapPerEmail(headers, personIds, userIds);
@@ -259,6 +258,8 @@ public class SapReportService extends BaseService {
 
 	// 组织以及职位信息 EmpJob
 	public void saveSapEmpJob(HttpHeaders headers, String userIds) throws Exception {
+		delete("SapReportMapper.deleteSapEmpJob", null);
+		
 		String url = "https://api15.sapsf.cn/odata/v2/EmpJob?$filter=userId in %s&$format=json"
 				+ "&$expand=positionNav,companyNav,divisionNav,departmentNav,customString19Nav,locationNav,jobCodeNav,customString2Nav,customString4Nav";
 		url = String.format(url, userIds);