Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

src/com/engine/organization/entity/chart/history/CompanyVirtualHistory.java

@@ -0,0 +1,46 @@
+package com.engine.organization.entity.chart.history;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2023/7/11 4:36 PM
+ * @Description: 虚拟维度历史表
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class CompanyVirtualHistory {
+
+    private Integer id;
+
+    private Integer companyVirtualId;
+
+    private String creater;
+
+    private String companyName;
+
+    private String companyCode;
+
+    private String companyDesc;
+
+    private Integer showOrder;
+
+    private Integer canceled;
+
+    private String virtualType;
+
+    private String virtualTypeDesc;
+
+    private String versionDate;
+
+    private Integer versionId;
+
+    private Integer fonJob;
+
+}

src/com/engine/organization/entity/chart/history/DepartmentHistory.java

@@ -0,0 +1,56 @@
+package com.engine.organization.entity.chart.history;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2023/7/11 4:36 PM
+ * @Description: 部门历史表
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class DepartmentHistory {
+
+    private Integer id;
+
+    private String creater;
+
+    private Integer departmentId;
+
+    private String departmentMark;
+
+    private String departmentName;
+
+    private String subcompanyId;
+
+    private String subcompany;
+
+    private Integer supDepartmentId;
+
+    private String supDepartment;
+
+    private Integer canceled;
+
+    private String departmentCode;
+
+    private String coadJutant;
+
+    private Integer tlevel;
+
+    private String versionDate;
+
+    private Integer versionId;
+
+    private Integer fonjob;
+
+    private Integer isVirtual;
+
+    private String fLeader;
+
+}

src/com/engine/organization/entity/chart/history/DepartmentVirtualHistory.java

@@ -0,0 +1,56 @@
+package com.engine.organization.entity.chart.history;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2023/7/11 4:36 PM
+ * @Description: 虚拟维度部门历史表
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class DepartmentVirtualHistory {
+
+    private Integer id;
+
+    private Integer departmentVirtualId;
+
+    private String creater;
+
+    private String departmentName;
+
+    private String departmentCode;
+
+    private String departmentMark;
+
+    private String  supDepartment;
+
+    private Integer supDepId;
+
+    private String allSupDepId;
+
+    private String subCompany;
+
+    private String subCompanyId;
+
+    private Integer canceled;
+
+    private String virtualType;
+
+    private String tLevel;
+
+    private String showOrder;
+
+    private String versionDate;
+
+    private Integer versionId;
+
+    private Integer fonJob;
+    
+}

src/com/engine/organization/entity/chart/history/JobHistory.java

@@ -0,0 +1,51 @@
+package com.engine.organization.entity.chart.history;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2023/7/11 4:59 PM
+ * @Description: 岗位历史表
+ * @Version 1.0
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class JobHistory {
+
+    private Integer id;
+
+    private String creater;
+
+    private Integer jobId;
+
+    private String jobName;
+
+    private Integer departmentId;
+
+    private String department;
+
+    private Integer subCompanyId;
+
+    private String subCompany;
+
+    private String jobResponsibility;
+
+    private Integer canceled;
+
+    private String jobCode;
+
+    private String description;
+
+    private String versionDate;
+
+    private Integer versionId;
+
+    private Integer fonJob;
+
+}

src/com/engine/organization/entity/chart/history/ResourceHistory.java

@@ -0,0 +1,94 @@
+package com.engine.organization.entity.chart.history;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2023/7/11 4:36 PM
+ * @Description: 人员历史表（增量）
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ResourceHistory {
+
+    private Integer id;
+
+    private Integer resourceId;
+
+    private String creater;
+
+    private Integer workyear;
+
+    private String usekind;
+
+    private String managerStr;
+
+    private Integer status;
+
+    private String sex;
+
+    private Integer accountType;
+
+    private Integer belongTo;
+
+    private String loginId;
+
+    private String maritalStatus;
+
+    private String telephone;
+
+    private String mobile;
+
+    private String mobileCall;
+
+    private String email;
+
+    private String locationName;
+
+    private String resourceType;
+
+    private String startDate;
+
+    private String endDate;
+
+    private Integer jobTitleId;
+
+    private String jobTitle;
+
+    private Integer jobLevel;
+
+    private Integer secLevel;
+
+    private Integer departmentId;
+
+    private String department;
+
+    private String subcompanyId;
+
+    private String subcompany;
+
+    private String costCenter;
+
+    private Integer manager;
+
+    private Integer assistant;
+
+    private String workcode;
+
+    private String  classification;
+
+    private String versionDate;
+
+    private Integer versionId;
+
+    private Integer policy;
+
+    private String degree;
+
+}

src/com/engine/organization/entity/chart/history/ResourceVirtualHistory.java

@@ -0,0 +1,42 @@
+package com.engine.organization.entity.chart.history;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2023/7/11 4:59 PM
+ * @Description: 虚拟人员历史表
+ * @Version 1.0
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ResourceVirtualHistory {
+
+    private Integer id;
+
+    private Integer resourceId;
+
+    private Integer managerId;
+
+    private Integer subCompanyId;
+
+    private String departmentId;
+
+    private String managerStr;
+
+    private Integer virtualType;
+
+    private String description;
+
+    private String versionDate;
+
+    private Integer versionId;
+
+
+}

src/com/engine/organization/entity/chart/history/SubCompanyVirtualHistory.java

@@ -0,0 +1,54 @@
+package com.engine.organization.entity.chart.history;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2023/7/11 4:36 PM
+ * @Description: 虚拟维度分部历史表
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SubCompanyVirtualHistory {
+
+    private Integer id;
+
+    private Integer subCompanyVirtualId;
+
+    private String creater;
+
+    private String subCompanyName;
+
+    private String subCompanyCode;
+
+    private String subCompanyDesc;
+
+    private String  supSubCompany;
+
+    private Integer supSubCompId;
+
+    private String company;
+
+    private String companyId;
+
+    private Integer canceled;
+
+    private String virtualType;
+
+    private String tLevel;
+
+    private String showOrder;
+
+    private String versionDate;
+
+    private Integer versionId;
+
+    private Integer fonJob;
+    
+}

src/com/engine/organization/entity/chart/history/SubcompanyHistory.java

@@ -0,0 +1,56 @@
+package com.engine.organization.entity.chart.history;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2023/7/11 4:36 PM
+ * @Description: 分部历史表
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SubcompanyHistory {
+
+    private Integer id;
+
+    private String creater;
+
+    private Integer subcompanyId;
+
+    private String subcompanyName;
+
+    private String subcompanyDesc;
+
+    private String company;
+
+    private String supSubcompanyId;
+
+    private String supSubcompany;
+
+    private Integer canceled;
+
+    private String subcompanyCode;
+
+    private Integer limitUsers;
+
+    private Integer tlevel;
+
+    private String versionDate;
+
+    private Integer versionId;
+
+    private Integer fonJob;
+
+    private Integer isVirtual;
+
+
+
+
+
+}