diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/SysDepartTreeModel.java b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/SysDepartTreeModel.java index 1997cfbd..b3a36063 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/SysDepartTreeModel.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/SysDepartTreeModel.java @@ -1,5 +1,7 @@ package com.jero.common.system.vo; +import org.jeecgframework.poi.excel.annotation.Excel; + import java.io.Serializable; import java.util.ArrayList; import java.util.Date; @@ -71,6 +73,14 @@ public class SysDepartTreeModel implements Serializable{ private Date updateTime; + private String company; + + private String headOfDepartment; + + private String leadersInCharge; + + private String deputyLeader; + private List children = new ArrayList<>(); @@ -288,6 +298,38 @@ public class SysDepartTreeModel implements Serializable{ this.updateTime = updateTime; } + public String getCompany() { + return company; + } + + public void setCompany(String company) { + this.company = company; + } + + public String getHeadOfDepartment() { + return headOfDepartment; + } + + public void setHeadOfDepartment(String headOfDepartment) { + this.headOfDepartment = headOfDepartment; + } + + public String getLeadersInCharge() { + return leadersInCharge; + } + + public void setLeadersInCharge(String leadersInCharge) { + this.leadersInCharge = leadersInCharge; + } + + public String getDeputyLeader() { + return deputyLeader; + } + + public void setDeputyLeader(String deputyLeader) { + this.deputyLeader = deputyLeader; + } + public SysDepartTreeModel() { // do other } @@ -324,6 +366,10 @@ public class SysDepartTreeModel implements Serializable{ Objects.equals(createTime, model.createTime) && Objects.equals(updateBy, model.updateBy) && Objects.equals(updateTime, model.updateTime) && + Objects.equals(company, model.company)&& + Objects.equals(headOfDepartment, model.headOfDepartment)&& + Objects.equals(leadersInCharge, model.leadersInCharge)&& + Objects.equals(deputyLeader, model.deputyLeader)&& Objects.equals(children, model.children); } @@ -336,7 +382,7 @@ public class SysDepartTreeModel implements Serializable{ return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr, departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address, memo, status, delFlag, createBy, createTime, updateBy, updateTime, - children); + headOfDepartment, leadersInCharge, deputyLeader, children); } } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java index 62cc6b75..5e0ad794 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java @@ -26,8 +26,8 @@ import java.util.Objects; public class SysDepart implements Serializable { private static final long serialVersionUID = 1L; - /**ID*/ - @TableId(type = IdType.ASSIGN_ID) + /**ID,用机构编码作为ID*/ + @TableId(type = IdType.INPUT) private String id; /**父机构ID*/ private String parentId; @@ -46,6 +46,7 @@ public class SysDepart implements Serializable { @Excel(name="描述",width=15) private String description; /**机构类别 1公司,2组织机构,2岗位*/ + // IAM 1.单位 2.部门 @Excel(name="机构类别",width=15,dicCode="org_category") private String orgCategory; /**机构类型*/ @@ -83,7 +84,33 @@ public class SysDepart implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; - + + // 如下为IAM新加数据 + + /** + * 所属单位,10位HR机构编号 + */ + @Excel(name="所属单位",width=15) + private String company; + + /** + * 部门负责人 + */ + @Excel(name="部门负责人",width=15) + private String headOfDepartment; + + /** + * 分管领导 + */ + @Excel(name="分管领导",width=15) + private String leadersInCharge; + + /** + * 副职领导 + */ + @Excel(name="副职领导",width=15) + private String deputyLeader; + /** * 重写equals方法 */ @@ -118,7 +145,11 @@ public class SysDepart implements Serializable { Objects.equals(createBy, depart.createBy) && Objects.equals(createTime, depart.createTime) && Objects.equals(updateBy, depart.updateBy) && - Objects.equals(updateTime, depart.updateTime); + Objects.equals(updateTime, depart.updateTime)&& + Objects.equals(company, depart.company)&& + Objects.equals(headOfDepartment, depart.headOfDepartment)&& + Objects.equals(leadersInCharge, depart.leadersInCharge)&& + Objects.equals(deputyLeader, depart.deputyLeader); } /** @@ -130,6 +161,7 @@ public class SysDepart implements Serializable { return Objects.hash(super.hashCode(), id, parentId, departName, departNameEn, departNameAbbr, departOrder, description,orgCategory, orgType, orgCode, mobile, fax, address, memo, status, - delFlag, createBy, createTime, updateBy, updateTime); + delFlag, createBy, createTime, updateBy, updateTime, + company, headOfDepartment, leadersInCharge, deputyLeader); } } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java b/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java index 1535fabc..f773fe34 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java @@ -158,5 +158,9 @@ public class FindsDepartsChildrenUtil { sysDepartTreeModel.setCreateTime(sysDepart.getCreateTime()); sysDepartTreeModel.setUpdateBy(sysDepart.getUpdateBy()); sysDepartTreeModel.setUpdateTime(sysDepart.getUpdateTime()); + sysDepartTreeModel.setCompany(sysDepart.getCompany()); + sysDepartTreeModel.setHeadOfDepartment(sysDepart.getHeadOfDepartment()); + sysDepartTreeModel.setLeadersInCharge(sysDepart.getLeadersInCharge()); + sysDepartTreeModel.setDeputyLeader(sysDepart.getDeputyLeader()); } }