fix

code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/core/WXCpBase.java

@@ -23,6 +23,7 @@ public class WXCpBase {
 	public static final WxCpService service = new WxCpServiceImpl();
 	public static final WxCpUserService userService;
 	public static final WxCpOAuth2Service oauth2Service;
+	public static final WxCpDepartmentService departService;
 	static {
 		WxCpDefaultConfigImpl configStorage = new WxCpDefaultConfigImpl();
 		configStorage.setCorpId(ConfConfig.getConfigString("wxCp.corpId"));
@@ -31,6 +32,8 @@ public class WXCpBase {
 		service.setWxCpConfigStorage(configStorage);
 		// 初始化service
 		userService = new WxCpUserServiceImpl(service);
+		// 初始化部门service
+		departService = new WxCpDepartmentServiceImpl(service);
 		//授权服务
 		oauth2Service= new WxCpOAuth2ServiceImpl(service);
 	}

code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/core/WXCpMailList.java

@@ -1,15 +1,12 @@
 package org.fouram.core.plugin.weixin.cp.core;
 
-import me.chanjar.weixin.cp.api.WxCpDepartmentService;
+import org.fouram.core.util.ConfConfig;
+
 import me.chanjar.weixin.cp.api.WxCpOAuth2Service;
 import me.chanjar.weixin.cp.api.WxCpService;
-import me.chanjar.weixin.cp.api.WxCpUserService;
-import me.chanjar.weixin.cp.api.impl.WxCpDepartmentServiceImpl;
 import me.chanjar.weixin.cp.api.impl.WxCpOAuth2ServiceImpl;
 import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
-import me.chanjar.weixin.cp.api.impl.WxCpUserServiceImpl;
 import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
-import org.fouram.core.util.ConfConfig;
 
 /**
  * 企业微信工具类

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

@@ -0,0 +1,31 @@
+package org.fouram.entity;
+
+import java.io.Serializable;
+
+import org.apache.ibatis.type.Alias;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Alias(value = "SapCourses")
+public class SapCourses implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String userId;
+	private String course;// 课程名称
+	private String institution;// 开始日期
+	private String instructionType;// 结束日期
+	private String lengthCode;// 培训类型
+	private String custom9;// 培训地点
+	private String custom1;// 历时
+	private String custom2;// 培训结果
+	private String custom3Code;// 是否有证书
+	private String custom4;// 培训服务期到期时间
+	private String custom7;// 备注
+}

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

@@ -0,0 +1,27 @@
+package org.fouram.entity;
+
+import java.io.Serializable;
+
+import org.apache.ibatis.type.Alias;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Alias(value = "SapEducation")
+public class SapEducation implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String userId;
+	private String startDate;// 开始日期
+	private String endDate;// 结束日期
+	private String school;// 院校
+	private String major;// 专业
+	private String degree;// 学历
+	private String custom1;// 学位
+}

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

@@ -0,0 +1,23 @@
+package org.fouram.entity;
+
+import java.io.Serializable;
+
+import org.apache.ibatis.type.Alias;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Alias(value = "SapEmpJobRelationships")
+public class SapEmpJobRelationships implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String userId;
+	private String relationshipTypeCode;// 关系类型
+	private String relUserName;// 姓名
+}

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

@@ -0,0 +1,25 @@
+package org.fouram.entity;
+
+import java.io.Serializable;
+
+import org.apache.ibatis.type.Alias;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Alias(value = "SapInsideWorkExperience")
+public class SapInsideWorkExperience implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String userId;
+	private String startDate;// 开始日期
+	private String endDate;// 结束日期
+	private String title;// 职务
+	private String department;// 部门
+}

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

@@ -0,0 +1,30 @@
+package org.fouram.entity;
+
+import java.io.Serializable;
+
+import org.apache.ibatis.type.Alias;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Alias(value = "SapOutsideWorkExperience")
+public class SapOutsideWorkExperience implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String userId;
+	private String startDate; // 开始日期
+	private String endDate;// 结束日期
+	private String employer;// 曾工作公司名称
+	private String businessType;// 公司所在地
+	private String startTitle;// 所在部门
+	private String custom1;// 职位
+	private String custom2;// 离职原因
+	private String custom3;// 直接上司姓名
+	private String custom4;// 联系方式
+}

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

@@ -6,7 +6,12 @@ import java.util.List;
 import org.fouram.core.base.service.BaseService;
 import org.fouram.core.base.service.RequestService;
 import org.fouram.entity.SapCertificates;
+import org.fouram.entity.SapCourses;
+import org.fouram.entity.SapEducation;
+import org.fouram.entity.SapEmpJobRelationships;
+import org.fouram.entity.SapInsideWorkExperience;
 import org.fouram.entity.SapLanguages;
+import org.fouram.entity.SapOutsideWorkExperience;
 import org.fouram.entity.SapOverallPerformance;
 import org.fouram.entity.SapPerEmail;
 import org.fouram.entity.SapPerGlobalInfoCHN;
@@ -284,6 +289,9 @@ public class SapReportService extends BaseService {
 				String relationshipTypeCode = userNode.get("relationshipTypeNav").get("externalCode").asText().trim();// 关系类型
 				String relUserName = userNode.get("relUserNav").get("lastName").asText().trim()
 						+ userNode.get("relUserNav").get("firstName").asText().trim();// 姓名
+				SapEmpJobRelationships entity = SapEmpJobRelationships.builder().userId(userId)
+						.relationshipTypeCode(relationshipTypeCode).relUserName(relUserName).build();
+				System.out.println(entity);
 			}
 		}
 	}
@@ -307,6 +315,10 @@ public class SapReportService extends BaseService {
 				String custom2 = userNode.get("custom2").asText().trim();// 离职原因
 				String custom3 = userNode.get("custom3").asText().trim();// 直接上司姓名
 				String custom4 = userNode.get("custom4").asText().trim();// 联系方式
+				SapOutsideWorkExperience entity = SapOutsideWorkExperience.builder().userId(userId).startDate(startDate)
+						.endDate(endDate).employer(employer).businessType(businessType).startTitle(startTitle)
+						.custom1(custom1).custom2(custom2).custom3(custom3).custom4(custom4).build();
+				System.out.println(entity);
 			}
 		}
 	}
@@ -325,6 +337,9 @@ public class SapReportService extends BaseService {
 				String endDate = userNode.get("endDate").asText().trim();// 结束日期
 				String title = userNode.get("title").asText().trim();// 职务
 				String department = userNode.get("department").asText().trim();// 部门
+				SapInsideWorkExperience entity = SapInsideWorkExperience.builder().userId(userId).startDate(startDate)
+						.endDate(endDate).title(title).department(department).build();
+				System.out.println(entity);
 			}
 		}
 	}
@@ -349,6 +364,10 @@ public class SapReportService extends BaseService {
 				String custom3Code = userNode.get("custom3Nav").get("externalCode").asText().trim();// 是否有证书
 				String custom4 = userNode.get("custom4").asText().trim();// 培训服务期到期时间
 				String custom7 = userNode.get("custom7").asText().trim();// 备注
+				SapCourses entity = SapCourses.builder().userId(userId).course(course).institution(institution)
+						.instructionType(instructionType).lengthCode(lengthCode).custom9(custom9).custom1(custom1)
+						.custom2(custom2).custom3Code(custom3Code).custom4(custom4).custom7(custom7).build();
+				System.out.println(entity);
 			}
 		}
 	}
@@ -369,6 +388,9 @@ public class SapReportService extends BaseService {
 				String major = userNode.get("major").asText().trim();// 专业
 				String degree = userNode.get("degree").asText().trim();// 学历
 				String custom1 = userNode.get("custom1").asText().trim();// 学位
+				SapEducation entity = SapEducation.builder().userId(userId).startDate(startDate).endDate(endDate)
+						.school(school).major(major).degree(degree).custom1(custom1).build();
+				System.out.println(entity);
 			}
 		}
 	}