fix

code/sapparent/sapservice/src/main/java/org/fouram/entity/SapCourses.java

@@ -19,8 +19,8 @@ public class SapCourses implements Serializable {
 
 	private String userId;
 	private String course;// 课程名称
-	private String institution;// 开始日期
-	private String instructionType;// 结束日期
+	private String startDate;// 开始日期
+	private String endData;// 结束日期
 	private String lengthCode;// 培训类型
 	private String place;// 培训地点
 	private String duration;// 历时

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapUserMapper.xml

@@ -84,8 +84,7 @@
 	<select id="selectListByDepartId" resultType="SapUser">
 		select * from sap_user 
 		where result = 'SUCCESS' and isPrimary = 1 and delFlag = 0 and (
-			firstOrgWxDepartId = #{departId} or secondOrgWxDepartId = #{departId} 
-			or thirdOrgWxDepartId = #{departId} or fourthOrgWxDepartId = #{departId})
+			firstOrgId = #{departId} or secondOrgId = #{departId} or thirdOrgId = #{departId} or fourthOrgId = #{departId})
 		order by sortNumber ASC
 	</select>
 </mapper>

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

@@ -50,23 +50,23 @@ public class SapReportService extends BaseService {
 			personIds += "'" + sapUser.getPersonId() + "',";
 			userIds += "'" + sapUser.getUserId() + "',";
 		}
-		this.saveSapCertificates(headers, userIds);
-		this.saveSapCourses(headers, userIds);
-		this.saveSapEducation(headers, userIds);
-		this.saveSapInsideWorkExperience(headers, userIds);
-		this.saveSapLanguages(headers, userIds);
-		this.saveSapOverallPerformance(headers, userIds);
-		this.saveSapEmpJob(headers, userIds);
+//		this.saveSapCertificates(headers, userIds);
+//		this.saveSapCourses(headers, userIds);
+//		this.saveSapEducation(headers, userIds);
+//		this.saveSapInsideWorkExperience(headers, 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);
-		this.saveSapPerGlobalInfoCHN(headers, personIds);
-		this.saveSapPerNationalId(headers, personIds);
-		this.saveSapPerPersonal(headers, personIds);
-		this.saveSapPerPerson(headers, personIds);
-		this.saveSapPerPhone(headers, personIds);
-		this.saveSapPerSocialAccount(headers, personIds);
+//		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
@@ -393,8 +393,8 @@ public class SapReportService extends BaseService {
 				JsonNode userNode = iterator.next();
 				String userId = JsonNodeUtil.getValue(userNode, "userId");
 				String course = JsonNodeUtil.getValue(userNode, "course");// 课程名称
-				String institution = JsonNodeUtil.getValue(userNode, "institution");// 开始日期
-				String instructionType = JsonNodeUtil.getValue(userNode, "instructionType");// 结束日期
+				String startDate = JsonNodeUtil.getValue(userNode, "institution");// 开始日期
+				String endData = JsonNodeUtil.getValue(userNode, "instructionType");// 结束日期
 				String lengthCode = JsonNodeUtil.getValue(userNode, "lengthNav", "externalCode");// 培训类型
 				String place = JsonNodeUtil.getValue(userNode, "custom9");// 培训地点
 				String duration = JsonNodeUtil.getValue(userNode, "custom1");// 历时
@@ -402,8 +402,8 @@ public class SapReportService extends BaseService {
 				String certificateOrNot = JsonNodeUtil.getValue(userNode, "custom3Nav", "externalCode");// 是否有证书
 				String dueTime = JsonNodeUtil.getValue(userNode, "custom4");// 培训服务期到期时间
 				String remark = JsonNodeUtil.getValue(userNode, "custom7");// 备注
-				SapCourses entity = SapCourses.builder().userId(userId).course(course).institution(institution)
-						.instructionType(instructionType).lengthCode(lengthCode).place(place).duration(duration)
+				SapCourses entity = SapCourses.builder().userId(userId).course(course).startDate(startDate)
+						.endData(endData).lengthCode(lengthCode).place(place).duration(duration)
 						.result(result).certificateOrNot(certificateOrNot).dueTime(dueTime).remark(remark).build();
 				save("SapReportMapper.saveSapCourses", entity);
 			}