xignzi006 发布系统代码 [Spring Boot]

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/client/res_companyFallback.java

@@ -81,4 +81,9 @@ public class res_companyFallback implements res_companyFeignClient{
      }
 
 
+    public Page<Res_company> searchROOT(Res_companySearchContext context){
+            return null;
+     }
+
+
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/client/res_companyFeignClient.java

@@ -76,4 +76,9 @@ public interface res_companyFeignClient {
     Page<Res_company> searchDefault(@RequestBody Res_companySearchContext context);
 
 
+
+    @RequestMapping(method = RequestMethod.POST, value = "/res_companies/searchroot")
+    Page<Res_company> searchROOT(@RequestBody Res_companySearchContext context);
+
+
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/domain/Res_supplier.java

@@ -124,8 +124,7 @@ public class Res_supplier extends EntityMP implements Serializable {
     /**
      * 采购付款条例
      */
-    @DEField(name = "property_supplier_payment_term_id")
-    @TableField(value = "property_supplier_payment_term_id")
+    @TableField(exist = false)
     @JSONField(name = "property_supplier_payment_term_id")
     @JsonProperty("property_supplier_payment_term_id")
     private Long propertySupplierPaymentTermId;
@@ -211,14 +210,6 @@ public class Res_supplier extends EntityMP implements Serializable {
         this.modify("category_id",categoryId);
     }
     
-    /**
-     * 设置 [采购付款条例]
-     */
-    public void setPropertySupplierPaymentTermId(Long propertySupplierPaymentTermId){
-        this.propertySupplierPaymentTermId = propertySupplierPaymentTermId ;
-        this.modify("property_supplier_payment_term_id",propertySupplierPaymentTermId);
-    }
-
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/mapper/Res_companyMapper.java

@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 public interface Res_companyMapper extends BaseMapper<Res_company>{
 
     Page<Res_company> searchDefault(IPage page, @Param("srf") Res_companySearchContext context, @Param("ew") Wrapper<Res_company> wrapper) ;
+    Page<Res_company> searchROOT(IPage page, @Param("srf") Res_companySearchContext context, @Param("ew") Wrapper<Res_company> wrapper) ;
     @Override
     Res_company selectById(Serializable id);
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/IRes_companyService.java

@@ -37,6 +37,7 @@ public interface IRes_companyService extends IService<Res_company>{
     boolean save(Res_company et) ;
     void saveBatch(List<Res_company> list) ;
     Page<Res_company> searchDefault(Res_companySearchContext context) ;
+    Page<Res_company> searchROOT(Res_companySearchContext context) ;
     List<Res_company> selectByPropertyStockAccountInputCategId(Long id);
     void resetByPropertyStockAccountInputCategId(Long id);
     void resetByPropertyStockAccountInputCategId(Collection<Long> ids);

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_companyServiceImpl.java

@@ -1003,6 +1003,15 @@ public class Res_companyServiceImpl extends EBSServiceImpl<Res_companyMapper, Re
         return new PageImpl<Res_company>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
+    /**
+     * 查询集合 根节点查询
+     */
+    @Override
+    public Page<Res_company> searchROOT(Res_companySearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Res_company> pages=baseMapper.searchROOT(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Res_company>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
 
 
     /**

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_usersServiceImpl.java

@@ -487,6 +487,9 @@ public class Res_usersServiceImpl extends EBSServiceImpl<Res_usersMapper, Res_us
     protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employee_categoryService hrEmployeeCategoryService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employee_skillService hrEmployeeSkillService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employeeService hrEmployeeService;
     @Autowired
     @Lazy
@@ -532,6 +535,15 @@ public class Res_usersServiceImpl extends EBSServiceImpl<Res_usersMapper, Res_us
     protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_resume_lineService hrResumeLineService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_resume_line_typeService hrResumeLineTypeService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skill_levelService hrSkillLevelService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skillService hrSkillService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_iap.service.IIap_accountService iapAccountService;
     @Autowired
     @Lazy

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/client/hr_departmentFallback.java

@@ -81,4 +81,9 @@ public class hr_departmentFallback implements hr_departmentFeignClient{
      }
 
 
+    public Page<Hr_department> searchROOT(Hr_departmentSearchContext context){
+            return null;
+     }
+
+
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/client/hr_departmentFeignClient.java

@@ -76,4 +76,9 @@ public interface hr_departmentFeignClient {
     Page<Hr_department> searchDefault(@RequestBody Hr_departmentSearchContext context);
 
 
+
+    @RequestMapping(method = RequestMethod.POST, value = "/hr_departments/searchroot")
+    Page<Hr_department> searchROOT(@RequestBody Hr_departmentSearchContext context);
+
+
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/domain/Hr_employee_skill.java

+package cn.ibizlab.businesscentral.core.odoo_hr.domain;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
+import cn.ibizlab.businesscentral.util.domain.EntityBase;
+import cn.ibizlab.businesscentral.util.annotation.DEField;
+import cn.ibizlab.businesscentral.util.enums.DEPredefinedFieldType;
+import cn.ibizlab.businesscentral.util.enums.DEFieldDefaultValueType;
+import cn.ibizlab.businesscentral.util.helper.DataObject;
+import java.io.Serializable;
+import lombok.*;
+import org.springframework.data.annotation.Transient;
+import cn.ibizlab.businesscentral.util.annotation.Audit;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.ibizlab.businesscentral.util.domain.EntityMP;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+
+/**
+ * 实体[员工技能]
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@JsonIgnoreProperties(value = "handler")
+@TableName(value = "HR_EMPLOYEE_SKILL",resultMap = "Hr_employee_skillResultMap")
+public class Hr_employee_skill extends EntityMP implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @DEField(isKeyField=true)
+    @TableId(value= "id",type=IdType.AUTO)
+    @JSONField(name = "id")
+    @JsonProperty("id")
+    private Long id;
+    /**
+     * ID
+     */
+    @DEField(name = "employee_id")
+    @TableField(value = "employee_id")
+    @JSONField(name = "employee_id")
+    @JsonProperty("employee_id")
+    private Long employeeId;
+    /**
+     * 员工
+     */
+    @TableField(exist = false)
+    @JSONField(name = "employee_name")
+    @JsonProperty("employee_name")
+    private String employeeName;
+    /**
+     * ID
+     */
+    @DEField(name = "skill_type_id")
+    @TableField(value = "skill_type_id")
+    @JSONField(name = "skill_type_id")
+    @JsonProperty("skill_type_id")
+    private Long skillTypeId;
+    /**
+     * ID
+     */
+    @DEField(name = "skill_id")
+    @TableField(value = "skill_id")
+    @JSONField(name = "skill_id")
+    @JsonProperty("skill_id")
+    private Long skillId;
+    /**
+     * ID
+     */
+    @DEField(name = "skill_level_id")
+    @TableField(value = "skill_level_id")
+    @JSONField(name = "skill_level_id")
+    @JsonProperty("skill_level_id")
+    private Long skillLevelId;
+    /**
+     * 技能类型
+     */
+    @TableField(exist = false)
+    @JSONField(name = "skill_type_name")
+    @JsonProperty("skill_type_name")
+    private String skillTypeName;
+    /**
+     * 技能
+     */
+    @TableField(exist = false)
+    @JSONField(name = "skill_name")
+    @JsonProperty("skill_name")
+    private String skillName;
+    /**
+     * 技能等级
+     */
+    @TableField(exist = false)
+    @JSONField(name = "skill_level_name")
+    @JsonProperty("skill_level_name")
+    private String skillLevelName;
+    /**
+     * 创建时间
+     */
+    @DEField(name = "create_date")
+    @TableField(value = "create_date")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "create_date" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("create_date")
+    private Timestamp createDate;
+    /**
+     * 最后更新时间
+     */
+    @DEField(name = "write_date")
+    @TableField(value = "write_date")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "write_date" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("write_date")
+    private Timestamp writeDate;
+    /**
+     * ID
+     */
+    @DEField(name = "create_uid")
+    @TableField(value = "create_uid")
+    @JSONField(name = "create_uid")
+    @JsonProperty("create_uid")
+    private Long createUid;
+    /**
+     * ID
+     */
+    @DEField(name = "write_uid")
+    @TableField(value = "write_uid")
+    @JSONField(name = "write_uid")
+    @JsonProperty("write_uid")
+    private Long writeUid;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_employee odooEmployee;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_level odooSkillLevel;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill odooSkill;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type odooSkillType;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooWrite;
+
+
+
+    /**
+     * 设置 [ID]
+     */
+    public void setEmployeeId(Long employeeId){
+        this.employeeId = employeeId ;
+        this.modify("employee_id",employeeId);
+    }
+
+    /**
+     * 设置 [ID]
+     */
+    public void setSkillTypeId(Long skillTypeId){
+        this.skillTypeId = skillTypeId ;
+        this.modify("skill_type_id",skillTypeId);
+    }
+
+    /**
+     * 设置 [ID]
+     */
+    public void setSkillId(Long skillId){
+        this.skillId = skillId ;
+        this.modify("skill_id",skillId);
+    }
+
+    /**
+     * 设置 [ID]
+     */
+    public void setSkillLevelId(Long skillLevelId){
+        this.skillLevelId = skillLevelId ;
+        this.modify("skill_level_id",skillLevelId);
+    }
+
+    /**
+     * 设置 [创建时间]
+     */
+    public void setCreateDate(Timestamp createDate){
+        this.createDate = createDate ;
+        this.modify("create_date",createDate);
+    }
+
+    /**
+     * 格式化日期 [创建时间]
+     */
+    public String formatCreateDate(){
+        if (this.createDate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(createDate);
+    }
+    /**
+     * 设置 [最后更新时间]
+     */
+    public void setWriteDate(Timestamp writeDate){
+        this.writeDate = writeDate ;
+        this.modify("write_date",writeDate);
+    }
+
+    /**
+     * 格式化日期 [最后更新时间]
+     */
+    public String formatWriteDate(){
+        if (this.writeDate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(writeDate);
+    }
+    /**
+     * 设置 [ID]
+     */
+    public void setCreateUid(Long createUid){
+        this.createUid = createUid ;
+        this.modify("create_uid",createUid);
+    }
+
+    /**
+     * 设置 [ID]
+     */
+    public void setWriteUid(Long writeUid){
+        this.writeUid = writeUid ;
+        this.modify("write_uid",writeUid);
+    }
+
+
+    @Override
+    public Serializable getDefaultKey(boolean gen) {
+       return IdWorker.getId();
+    }
+    /**
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
+        this.reset("id");
+        return super.copyTo(targetEntity,bIncEmpty);
+    }
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/domain/Hr_resume_line.java

@@ -139,6 +139,14 @@ public class Hr_resume_line extends EntityMP implements Serializable {
     @JSONField(name = "create_uid")
     @JsonProperty("create_uid")
     private Long createUid;
+    /**
+     * ID
+     */
+    @DEField(name = "write_uid")
+    @TableField(value = "write_uid")
+    @JSONField(name = "write_uid")
+    @JsonProperty("write_uid")
+    private Long writeUid;
 
     /**
      * 
@@ -164,6 +172,14 @@ public class Hr_resume_line extends EntityMP implements Serializable {
     @TableField(exist = false)
     private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate;
 
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooWrite;
+
 
 
     /**
@@ -278,6 +294,14 @@ public class Hr_resume_line extends EntityMP implements Serializable {
         this.modify("create_uid",createUid);
     }
 
+    /**
+     * 设置 [ID]
+     */
+    public void setWriteUid(Long writeUid){
+        this.writeUid = writeUid ;
+        this.modify("write_uid",writeUid);
+    }
+
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/domain/Hr_resume_line_type.java

@@ -64,6 +64,56 @@ public class Hr_resume_line_type extends EntityMP implements Serializable {
     @JSONField(name = "sequence")
     @JsonProperty("sequence")
     private Integer sequence;
+    /**
+     * 创建时间
+     */
+    @DEField(name = "create_date")
+    @TableField(value = "create_date")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "create_date" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("create_date")
+    private Timestamp createDate;
+    /**
+     * 最后更新时间
+     */
+    @DEField(name = "write_date")
+    @TableField(value = "write_date")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "write_date" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("write_date")
+    private Timestamp writeDate;
+    /**
+     * ID
+     */
+    @DEField(name = "write_uid")
+    @TableField(value = "write_uid")
+    @JSONField(name = "write_uid")
+    @JsonProperty("write_uid")
+    private Long writeUid;
+    /**
+     * ID
+     */
+    @DEField(name = "create_uid")
+    @TableField(value = "create_uid")
+    @JSONField(name = "create_uid")
+    @JsonProperty("create_uid")
+    private Long createUid;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooWrite;
 
 
 
@@ -83,6 +133,58 @@ public class Hr_resume_line_type extends EntityMP implements Serializable {
         this.modify("sequence",sequence);
     }
 
+    /**
+     * 设置 [创建时间]
+     */
+    public void setCreateDate(Timestamp createDate){
+        this.createDate = createDate ;
+        this.modify("create_date",createDate);
+    }
+
+    /**
+     * 格式化日期 [创建时间]
+     */
+    public String formatCreateDate(){
+        if (this.createDate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(createDate);
+    }
+    /**
+     * 设置 [最后更新时间]
+     */
+    public void setWriteDate(Timestamp writeDate){
+        this.writeDate = writeDate ;
+        this.modify("write_date",writeDate);
+    }
+
+    /**
+     * 格式化日期 [最后更新时间]
+     */
+    public String formatWriteDate(){
+        if (this.writeDate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(writeDate);
+    }
+    /**
+     * 设置 [ID]
+     */
+    public void setWriteUid(Long writeUid){
+        this.writeUid = writeUid ;
+        this.modify("write_uid",writeUid);
+    }
+
+    /**
+     * 设置 [ID]
+     */
+    public void setCreateUid(Long createUid){
+        this.createUid = createUid ;
+        this.modify("create_uid",createUid);
+    }
+
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/domain/Hr_skill.java

+package cn.ibizlab.businesscentral.core.odoo_hr.domain;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
+import cn.ibizlab.businesscentral.util.domain.EntityBase;
+import cn.ibizlab.businesscentral.util.annotation.DEField;
+import cn.ibizlab.businesscentral.util.enums.DEPredefinedFieldType;
+import cn.ibizlab.businesscentral.util.enums.DEFieldDefaultValueType;
+import cn.ibizlab.businesscentral.util.helper.DataObject;
+import java.io.Serializable;
+import lombok.*;
+import org.springframework.data.annotation.Transient;
+import cn.ibizlab.businesscentral.util.annotation.Audit;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.ibizlab.businesscentral.util.domain.EntityMP;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+
+/**
+ * 实体[技能]
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@JsonIgnoreProperties(value = "handler")
+@TableName(value = "HR_SKILL",resultMap = "Hr_skillResultMap")
+public class Hr_skill extends EntityMP implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 技能类型
+     */
+    @DEField(name = "skill_type_id")
+    @TableField(value = "skill_type_id")
+    @JSONField(name = "skill_type_id")
+    @JsonProperty("skill_type_id")
+    private Long skillTypeId;
+    /**
+     * ID
+     */
+    @DEField(isKeyField=true)
+    @TableId(value= "id",type=IdType.AUTO)
+    @JSONField(name = "id")
+    @JsonProperty("id")
+    private Long id;
+    /**
+     * 名称
+     */
+    @TableField(value = "name")
+    @JSONField(name = "name")
+    @JsonProperty("name")
+    private String name;
+    /**
+     * 类型
+     */
+    @TableField(exist = false)
+    @JSONField(name = "skill_type_name")
+    @JsonProperty("skill_type_name")
+    private String skillTypeName;
+    /**
+     * 创建时间
+     */
+    @DEField(name = "create_date")
+    @TableField(value = "create_date")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "create_date" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("create_date")
+    private Timestamp createDate;
+    /**
+     * 最后更新时间
+     */
+    @DEField(name = "write_date")
+    @TableField(value = "write_date")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "write_date" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("write_date")
+    private Timestamp writeDate;
+    /**
+     * ID
+     */
+    @DEField(name = "create_uid")
+    @TableField(value = "create_uid")
+    @JSONField(name = "create_uid")
+    @JsonProperty("create_uid")
+    private Long createUid;
+    /**
+     * ID
+     */
+    @DEField(name = "write_uid")
+    @TableField(value = "write_uid")
+    @JSONField(name = "write_uid")
+    @JsonProperty("write_uid")
+    private Long writeUid;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type odooSkillType;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooWrite;
+
+
+
+    /**
+     * 设置 [技能类型]
+     */
+    public void setSkillTypeId(Long skillTypeId){
+        this.skillTypeId = skillTypeId ;
+        this.modify("skill_type_id",skillTypeId);
+    }
+
+    /**
+     * 设置 [名称]
+     */
+    public void setName(String name){
+        this.name = name ;
+        this.modify("name",name);
+    }
+
+    /**
+     * 设置 [创建时间]
+     */
+    public void setCreateDate(Timestamp createDate){
+        this.createDate = createDate ;
+        this.modify("create_date",createDate);
+    }
+
+    /**
+     * 格式化日期 [创建时间]
+     */
+    public String formatCreateDate(){
+        if (this.createDate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(createDate);
+    }
+    /**
+     * 设置 [最后更新时间]
+     */
+    public void setWriteDate(Timestamp writeDate){
+        this.writeDate = writeDate ;
+        this.modify("write_date",writeDate);
+    }
+
+    /**
+     * 格式化日期 [最后更新时间]
+     */
+    public String formatWriteDate(){
+        if (this.writeDate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(writeDate);
+    }
+    /**
+     * 设置 [ID]
+     */
+    public void setCreateUid(Long createUid){
+        this.createUid = createUid ;
+        this.modify("create_uid",createUid);
+    }
+
+    /**
+     * 设置 [ID]
+     */
+    public void setWriteUid(Long writeUid){
+        this.writeUid = writeUid ;
+        this.modify("write_uid",writeUid);
+    }
+
+
+    @Override
+    public Serializable getDefaultKey(boolean gen) {
+       return IdWorker.getId();
+    }
+    /**
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
+        this.reset("id");
+        return super.copyTo(targetEntity,bIncEmpty);
+    }
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/domain/Hr_skill_level.java

+package cn.ibizlab.businesscentral.core.odoo_hr.domain;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
+import cn.ibizlab.businesscentral.util.domain.EntityBase;
+import cn.ibizlab.businesscentral.util.annotation.DEField;
+import cn.ibizlab.businesscentral.util.enums.DEPredefinedFieldType;
+import cn.ibizlab.businesscentral.util.enums.DEFieldDefaultValueType;
+import cn.ibizlab.businesscentral.util.helper.DataObject;
+import java.io.Serializable;
+import lombok.*;
+import org.springframework.data.annotation.Transient;
+import cn.ibizlab.businesscentral.util.annotation.Audit;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.ibizlab.businesscentral.util.domain.EntityMP;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+
+/**
+ * 实体[技能等级]
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@JsonIgnoreProperties(value = "handler")
+@TableName(value = "HR_SKILL_LEVEL",resultMap = "Hr_skill_levelResultMap")
+public class Hr_skill_level extends EntityMP implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @DEField(isKeyField=true)
+    @TableId(value= "id",type=IdType.AUTO)
+    @JSONField(name = "id")
+    @JsonProperty("id")
+    private Long id;
+    /**
+     * 名称
+     */
+    @TableField(value = "name")
+    @JSONField(name = "name")
+    @JsonProperty("name")
+    private String name;
+    /**
+     * 技能类型
+     */
+    @DEField(name = "skill_type_id")
+    @TableField(value = "skill_type_id")
+    @JSONField(name = "skill_type_id")
+    @JsonProperty("skill_type_id")
+    private Long skillTypeId;
+    /**
+     * 技能类型
+     */
+    @TableField(exist = false)
+    @JSONField(name = "skill_type_name")
+    @JsonProperty("skill_type_name")
+    private String skillTypeName;
+    /**
+     * 最后更新时间
+     */
+    @DEField(name = "write_date")
+    @TableField(value = "write_date")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "write_date" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("write_date")
+    private Timestamp writeDate;
+    /**
+     * 创建时间
+     */
+    @DEField(name = "create_date")
+    @TableField(value = "create_date")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "create_date" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("create_date")
+    private Timestamp createDate;
+    /**
+     * ID
+     */
+    @DEField(name = "write_uid")
+    @TableField(value = "write_uid")
+    @JSONField(name = "write_uid")
+    @JsonProperty("write_uid")
+    private Long writeUid;
+    /**
+     * ID
+     */
+    @DEField(name = "create_uid")
+    @TableField(value = "create_uid")
+    @JSONField(name = "create_uid")
+    @JsonProperty("create_uid")
+    private Long createUid;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type odooSkillType;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooCreate;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooWrite;
+
+
+
+    /**
+     * 设置 [名称]
+     */
+    public void setName(String name){
+        this.name = name ;
+        this.modify("name",name);
+    }
+
+    /**
+     * 设置 [技能类型]
+     */
+    public void setSkillTypeId(Long skillTypeId){
+        this.skillTypeId = skillTypeId ;
+        this.modify("skill_type_id",skillTypeId);
+    }
+
+    /**
+     * 设置 [最后更新时间]
+     */
+    public void setWriteDate(Timestamp writeDate){
+        this.writeDate = writeDate ;
+        this.modify("write_date",writeDate);
+    }
+
+    /**
+     * 格式化日期 [最后更新时间]
+     */
+    public String formatWriteDate(){
+        if (this.writeDate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(writeDate);
+    }
+    /**
+     * 设置 [创建时间]
+     */
+    public void setCreateDate(Timestamp createDate){
+        this.createDate = createDate ;
+        this.modify("create_date",createDate);
+    }
+
+    /**
+     * 格式化日期 [创建时间]
+     */
+    public String formatCreateDate(){
+        if (this.createDate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(createDate);
+    }
+    /**
+     * 设置 [ID]
+     */
+    public void setWriteUid(Long writeUid){
+        this.writeUid = writeUid ;
+        this.modify("write_uid",writeUid);
+    }
+
+    /**
+     * 设置 [ID]
+     */
+    public void setCreateUid(Long createUid){
+        this.createUid = createUid ;
+        this.modify("create_uid",createUid);
+    }
+
+
+    @Override
+    public Serializable getDefaultKey(boolean gen) {
+       return IdWorker.getId();
+    }
+    /**
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
+        this.reset("id");
+        return super.copyTo(targetEntity,bIncEmpty);
+    }
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/domain/Hr_skill_type.java

+package cn.ibizlab.businesscentral.core.odoo_hr.domain;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
+import cn.ibizlab.businesscentral.util.domain.EntityBase;
+import cn.ibizlab.businesscentral.util.annotation.DEField;
+import cn.ibizlab.businesscentral.util.enums.DEPredefinedFieldType;
+import cn.ibizlab.businesscentral.util.enums.DEFieldDefaultValueType;
+import cn.ibizlab.businesscentral.util.helper.DataObject;
+import java.io.Serializable;
+import lombok.*;
+import org.springframework.data.annotation.Transient;
+import cn.ibizlab.businesscentral.util.annotation.Audit;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.ibizlab.businesscentral.util.domain.EntityMP;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+
+/**
+ * 实体[技能类型]
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@JsonIgnoreProperties(value = "handler")
+@TableName(value = "HR_SKILL_TYPE",resultMap = "Hr_skill_typeResultMap")
+public class Hr_skill_type extends EntityMP implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @DEField(isKeyField=true)
+    @TableId(value= "id",type=IdType.AUTO)
+    @JSONField(name = "id")
+    @JsonProperty("id")
+    private Long id;
+    /**
+     * 名称
+     */
+    @TableField(value = "name")
+    @JSONField(name = "name")
+    @JsonProperty("name")
+    private String name;
+
+
+
+    /**
+     * 设置 [名称]
+     */
+    public void setName(String name){
+        this.name = name ;
+        this.modify("name",name);
+    }
+
+
+    @Override
+    public Serializable getDefaultKey(boolean gen) {
+       return IdWorker.getId();
+    }
+    /**
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
+        this.reset("id");
+        return super.copyTo(targetEntity,bIncEmpty);
+    }
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/filter/Hr_employee_skillSearchContext.java

+package cn.ibizlab.businesscentral.core.odoo_hr.filter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import lombok.*;
+import lombok.extern.slf4j.Slf4j;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+
+import cn.ibizlab.businesscentral.util.filter.QueryWrapperContext;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_employee_skill;
+/**
+ * 关系型数据实体[Hr_employee_skill] 查询条件对象
+ */
+@Slf4j
+@Data
+public class Hr_employee_skillSearchContext extends QueryWrapperContext<Hr_employee_skill> {
+
+	private Long n_employee_id_eq;//[ID]
+	public void setN_employee_id_eq(Long n_employee_id_eq) {
+        this.n_employee_id_eq = n_employee_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_employee_id_eq)){
+            this.getSearchCond().eq("employee_id", n_employee_id_eq);
+        }
+    }
+	private String n_employee_name_eq;//[员工]
+	public void setN_employee_name_eq(String n_employee_name_eq) {
+        this.n_employee_name_eq = n_employee_name_eq;
+        if(!ObjectUtils.isEmpty(this.n_employee_name_eq)){
+            this.getSearchCond().eq("employee_name", n_employee_name_eq);
+        }
+    }
+	private String n_employee_name_like;//[员工]
+	public void setN_employee_name_like(String n_employee_name_like) {
+        this.n_employee_name_like = n_employee_name_like;
+        if(!ObjectUtils.isEmpty(this.n_employee_name_like)){
+            this.getSearchCond().like("employee_name", n_employee_name_like);
+        }
+    }
+	private Long n_skill_type_id_eq;//[ID]
+	public void setN_skill_type_id_eq(Long n_skill_type_id_eq) {
+        this.n_skill_type_id_eq = n_skill_type_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_skill_type_id_eq)){
+            this.getSearchCond().eq("skill_type_id", n_skill_type_id_eq);
+        }
+    }
+	private Long n_skill_id_eq;//[ID]
+	public void setN_skill_id_eq(Long n_skill_id_eq) {
+        this.n_skill_id_eq = n_skill_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_skill_id_eq)){
+            this.getSearchCond().eq("skill_id", n_skill_id_eq);
+        }
+    }
+	private Long n_skill_level_id_eq;//[ID]
+	public void setN_skill_level_id_eq(Long n_skill_level_id_eq) {
+        this.n_skill_level_id_eq = n_skill_level_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_skill_level_id_eq)){
+            this.getSearchCond().eq("skill_level_id", n_skill_level_id_eq);
+        }
+    }
+	private String n_skill_type_name_eq;//[技能类型]
+	public void setN_skill_type_name_eq(String n_skill_type_name_eq) {
+        this.n_skill_type_name_eq = n_skill_type_name_eq;
+        if(!ObjectUtils.isEmpty(this.n_skill_type_name_eq)){
+            this.getSearchCond().eq("skill_type_name", n_skill_type_name_eq);
+        }
+    }
+	private String n_skill_type_name_like;//[技能类型]
+	public void setN_skill_type_name_like(String n_skill_type_name_like) {
+        this.n_skill_type_name_like = n_skill_type_name_like;
+        if(!ObjectUtils.isEmpty(this.n_skill_type_name_like)){
+            this.getSearchCond().like("skill_type_name", n_skill_type_name_like);
+        }
+    }
+	private String n_skill_name_eq;//[技能]
+	public void setN_skill_name_eq(String n_skill_name_eq) {
+        this.n_skill_name_eq = n_skill_name_eq;
+        if(!ObjectUtils.isEmpty(this.n_skill_name_eq)){
+            this.getSearchCond().eq("skill_name", n_skill_name_eq);
+        }
+    }
+	private String n_skill_name_like;//[技能]
+	public void setN_skill_name_like(String n_skill_name_like) {
+        this.n_skill_name_like = n_skill_name_like;
+        if(!ObjectUtils.isEmpty(this.n_skill_name_like)){
+            this.getSearchCond().like("skill_name", n_skill_name_like);
+        }
+    }
+	private String n_skill_level_name_eq;//[技能等级]
+	public void setN_skill_level_name_eq(String n_skill_level_name_eq) {
+        this.n_skill_level_name_eq = n_skill_level_name_eq;
+        if(!ObjectUtils.isEmpty(this.n_skill_level_name_eq)){
+            this.getSearchCond().eq("skill_level_name", n_skill_level_name_eq);
+        }
+    }
+	private String n_skill_level_name_like;//[技能等级]
+	public void setN_skill_level_name_like(String n_skill_level_name_like) {
+        this.n_skill_level_name_like = n_skill_level_name_like;
+        if(!ObjectUtils.isEmpty(this.n_skill_level_name_like)){
+            this.getSearchCond().like("skill_level_name", n_skill_level_name_like);
+        }
+    }
+	private Long n_create_uid_eq;//[ID]
+	public void setN_create_uid_eq(Long n_create_uid_eq) {
+        this.n_create_uid_eq = n_create_uid_eq;
+        if(!ObjectUtils.isEmpty(this.n_create_uid_eq)){
+            this.getSearchCond().eq("create_uid", n_create_uid_eq);
+        }
+    }
+	private Long n_write_uid_eq;//[ID]
+	public void setN_write_uid_eq(Long n_write_uid_eq) {
+        this.n_write_uid_eq = n_write_uid_eq;
+        if(!ObjectUtils.isEmpty(this.n_write_uid_eq)){
+            this.getSearchCond().eq("write_uid", n_write_uid_eq);
+        }
+    }
+
+    /**
+	 * 启用快速搜索
+	 */
+	public void setQuery(String query)
+	{
+		 this.query=query;
+		 if(!StringUtils.isEmpty(query)){
+            this.getSearchCond().and( wrapper ->
+                     wrapper.like("employee_name", query)   
+            );
+		 }
+	}
+}
+
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/filter/Hr_resume_lineSearchContext.java

@@ -90,6 +90,13 @@ public class Hr_resume_lineSearchContext extends QueryWrapperContext<Hr_resume_l
             this.getSearchCond().eq("create_uid", n_create_uid_eq);
         }
     }
+	private Long n_write_uid_eq;//[ID]
+	public void setN_write_uid_eq(Long n_write_uid_eq) {
+        this.n_write_uid_eq = n_write_uid_eq;
+        if(!ObjectUtils.isEmpty(this.n_write_uid_eq)){
+            this.getSearchCond().eq("write_uid", n_write_uid_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/filter/Hr_resume_line_typeSearchContext.java

@@ -34,6 +34,20 @@ public class Hr_resume_line_typeSearchContext extends QueryWrapperContext<Hr_res
             this.getSearchCond().like("name", n_name_like);
         }
     }
+	private Long n_write_uid_eq;//[ID]
+	public void setN_write_uid_eq(Long n_write_uid_eq) {
+        this.n_write_uid_eq = n_write_uid_eq;
+        if(!ObjectUtils.isEmpty(this.n_write_uid_eq)){
+            this.getSearchCond().eq("write_uid", n_write_uid_eq);
+        }
+    }
+	private Long n_create_uid_eq;//[ID]
+	public void setN_create_uid_eq(Long n_create_uid_eq) {
+        this.n_create_uid_eq = n_create_uid_eq;
+        if(!ObjectUtils.isEmpty(this.n_create_uid_eq)){
+            this.getSearchCond().eq("create_uid", n_create_uid_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/filter/Hr_skillSearchContext.java

+package cn.ibizlab.businesscentral.core.odoo_hr.filter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import lombok.*;
+import lombok.extern.slf4j.Slf4j;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+
+import cn.ibizlab.businesscentral.util.filter.QueryWrapperContext;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill;
+/**
+ * 关系型数据实体[Hr_skill] 查询条件对象
+ */
+@Slf4j
+@Data
+public class Hr_skillSearchContext extends QueryWrapperContext<Hr_skill> {
+
+	private Long n_skill_type_id_eq;//[技能类型]
+	public void setN_skill_type_id_eq(Long n_skill_type_id_eq) {
+        this.n_skill_type_id_eq = n_skill_type_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_skill_type_id_eq)){
+            this.getSearchCond().eq("skill_type_id", n_skill_type_id_eq);
+        }
+    }
+	private String n_name_like;//[名称]
+	public void setN_name_like(String n_name_like) {
+        this.n_name_like = n_name_like;
+        if(!ObjectUtils.isEmpty(this.n_name_like)){
+            this.getSearchCond().like("name", n_name_like);
+        }
+    }
+	private String n_skill_type_name_eq;//[类型]
+	public void setN_skill_type_name_eq(String n_skill_type_name_eq) {
+        this.n_skill_type_name_eq = n_skill_type_name_eq;
+        if(!ObjectUtils.isEmpty(this.n_skill_type_name_eq)){
+            this.getSearchCond().eq("skill_type_name", n_skill_type_name_eq);
+        }
+    }
+	private String n_skill_type_name_like;//[类型]
+	public void setN_skill_type_name_like(String n_skill_type_name_like) {
+        this.n_skill_type_name_like = n_skill_type_name_like;
+        if(!ObjectUtils.isEmpty(this.n_skill_type_name_like)){
+            this.getSearchCond().like("skill_type_name", n_skill_type_name_like);
+        }
+    }
+	private Long n_create_uid_eq;//[ID]
+	public void setN_create_uid_eq(Long n_create_uid_eq) {
+        this.n_create_uid_eq = n_create_uid_eq;
+        if(!ObjectUtils.isEmpty(this.n_create_uid_eq)){
+            this.getSearchCond().eq("create_uid", n_create_uid_eq);
+        }
+    }
+	private Long n_write_uid_eq;//[ID]
+	public void setN_write_uid_eq(Long n_write_uid_eq) {
+        this.n_write_uid_eq = n_write_uid_eq;
+        if(!ObjectUtils.isEmpty(this.n_write_uid_eq)){
+            this.getSearchCond().eq("write_uid", n_write_uid_eq);
+        }
+    }
+
+    /**
+	 * 启用快速搜索
+	 */
+	public void setQuery(String query)
+	{
+		 this.query=query;
+		 if(!StringUtils.isEmpty(query)){
+            this.getSearchCond().and( wrapper ->
+                     wrapper.like("name", query)   
+            );
+		 }
+	}
+}
+
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/filter/Hr_skill_levelSearchContext.java

+package cn.ibizlab.businesscentral.core.odoo_hr.filter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import lombok.*;
+import lombok.extern.slf4j.Slf4j;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+
+import cn.ibizlab.businesscentral.util.filter.QueryWrapperContext;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_level;
+/**
+ * 关系型数据实体[Hr_skill_level] 查询条件对象
+ */
+@Slf4j
+@Data
+public class Hr_skill_levelSearchContext extends QueryWrapperContext<Hr_skill_level> {
+
+	private String n_name_like;//[名称]
+	public void setN_name_like(String n_name_like) {
+        this.n_name_like = n_name_like;
+        if(!ObjectUtils.isEmpty(this.n_name_like)){
+            this.getSearchCond().like("name", n_name_like);
+        }
+    }
+	private Long n_skill_type_id_eq;//[技能类型]
+	public void setN_skill_type_id_eq(Long n_skill_type_id_eq) {
+        this.n_skill_type_id_eq = n_skill_type_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_skill_type_id_eq)){
+            this.getSearchCond().eq("skill_type_id", n_skill_type_id_eq);
+        }
+    }
+	private String n_skill_type_name_eq;//[技能类型]
+	public void setN_skill_type_name_eq(String n_skill_type_name_eq) {
+        this.n_skill_type_name_eq = n_skill_type_name_eq;
+        if(!ObjectUtils.isEmpty(this.n_skill_type_name_eq)){
+            this.getSearchCond().eq("skill_type_name", n_skill_type_name_eq);
+        }
+    }
+	private String n_skill_type_name_like;//[技能类型]
+	public void setN_skill_type_name_like(String n_skill_type_name_like) {
+        this.n_skill_type_name_like = n_skill_type_name_like;
+        if(!ObjectUtils.isEmpty(this.n_skill_type_name_like)){
+            this.getSearchCond().like("skill_type_name", n_skill_type_name_like);
+        }
+    }
+	private Long n_write_uid_eq;//[ID]
+	public void setN_write_uid_eq(Long n_write_uid_eq) {
+        this.n_write_uid_eq = n_write_uid_eq;
+        if(!ObjectUtils.isEmpty(this.n_write_uid_eq)){
+            this.getSearchCond().eq("write_uid", n_write_uid_eq);
+        }
+    }
+	private Long n_create_uid_eq;//[ID]
+	public void setN_create_uid_eq(Long n_create_uid_eq) {
+        this.n_create_uid_eq = n_create_uid_eq;
+        if(!ObjectUtils.isEmpty(this.n_create_uid_eq)){
+            this.getSearchCond().eq("create_uid", n_create_uid_eq);
+        }
+    }
+
+    /**
+	 * 启用快速搜索
+	 */
+	public void setQuery(String query)
+	{
+		 this.query=query;
+		 if(!StringUtils.isEmpty(query)){
+            this.getSearchCond().and( wrapper ->
+                     wrapper.like("name", query)   
+            );
+		 }
+	}
+}
+
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/filter/Hr_skill_typeSearchContext.java

+package cn.ibizlab.businesscentral.core.odoo_hr.filter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import lombok.*;
+import lombok.extern.slf4j.Slf4j;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+
+import cn.ibizlab.businesscentral.util.filter.QueryWrapperContext;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type;
+/**
+ * 关系型数据实体[Hr_skill_type] 查询条件对象
+ */
+@Slf4j
+@Data
+public class Hr_skill_typeSearchContext extends QueryWrapperContext<Hr_skill_type> {
+
+	private String n_name_like;//[名称]
+	public void setN_name_like(String n_name_like) {
+        this.n_name_like = n_name_like;
+        if(!ObjectUtils.isEmpty(this.n_name_like)){
+            this.getSearchCond().like("name", n_name_like);
+        }
+    }
+
+    /**
+	 * 启用快速搜索
+	 */
+	public void setQuery(String query)
+	{
+		 this.query=query;
+		 if(!StringUtils.isEmpty(query)){
+            this.getSearchCond().and( wrapper ->
+                     wrapper.like("name", query)   
+            );
+		 }
+	}
+}
+
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/mapper/Hr_departmentMapper.java

@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 public interface Hr_departmentMapper extends BaseMapper<Hr_department>{
 
     Page<Hr_department> searchDefault(IPage page, @Param("srf") Hr_departmentSearchContext context, @Param("ew") Wrapper<Hr_department> wrapper) ;
+    Page<Hr_department> searchROOT(IPage page, @Param("srf") Hr_departmentSearchContext context, @Param("ew") Wrapper<Hr_department> wrapper) ;
     @Override
     Hr_department selectById(Serializable id);
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/mapper/Hr_employee_skillMapper.java

+package cn.ibizlab.businesscentral.core.odoo_hr.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.*;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.HashMap;
+import org.apache.ibatis.annotations.Select;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_employee_skill;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_employee_skillSearchContext;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.alibaba.fastjson.JSONObject;
+
+public interface Hr_employee_skillMapper extends BaseMapper<Hr_employee_skill>{
+
+    Page<Hr_employee_skill> searchDefault(IPage page, @Param("srf") Hr_employee_skillSearchContext context, @Param("ew") Wrapper<Hr_employee_skill> wrapper) ;
+    @Override
+    Hr_employee_skill selectById(Serializable id);
+    @Override
+    int insert(Hr_employee_skill entity);
+    @Override
+    int updateById(@Param(Constants.ENTITY) Hr_employee_skill entity);
+    @Override
+    int update(@Param(Constants.ENTITY) Hr_employee_skill entity, @Param("ew") Wrapper<Hr_employee_skill> updateWrapper);
+    @Override
+    int deleteById(Serializable id);
+     /**
+      * 自定义查询SQL
+      * @param sql
+      * @return
+      */
+     @Select("${sql}")
+     List<JSONObject> selectBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义更新SQL
+    * @param sql
+    * @return
+    */
+    @Update("${sql}")
+    boolean updateBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义插入SQL
+    * @param sql
+    * @return
+    */
+    @Insert("${sql}")
+    boolean insertBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义删除SQL
+    * @param sql
+    * @return
+    */
+    @Delete("${sql}")
+    boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    List<Hr_employee_skill> selectByEmployeeId(@Param("id") Serializable id) ;
+
+    List<Hr_employee_skill> selectBySkillLevelId(@Param("id") Serializable id) ;
+
+    List<Hr_employee_skill> selectBySkillId(@Param("id") Serializable id) ;
+
+    List<Hr_employee_skill> selectBySkillTypeId(@Param("id") Serializable id) ;
+
+    List<Hr_employee_skill> selectByCreateUid(@Param("id") Serializable id) ;
+
+    List<Hr_employee_skill> selectByWriteUid(@Param("id") Serializable id) ;
+
+
+}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/mapper/Hr_resume_lineMapper.java

@@ -68,5 +68,7 @@ public interface Hr_resume_lineMapper extends BaseMapper<Hr_resume_line>{
 
     List<Hr_resume_line> selectByCreateUid(@Param("id") Serializable id) ;
 
+    List<Hr_resume_line> selectByWriteUid(@Param("id") Serializable id) ;
+
 
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/mapper/Hr_resume_line_typeMapper.java

@@ -62,5 +62,9 @@ public interface Hr_resume_line_typeMapper extends BaseMapper<Hr_resume_line_typ
     @Delete("${sql}")
     boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
 
+    List<Hr_resume_line_type> selectByCreateUid(@Param("id") Serializable id) ;
+
+    List<Hr_resume_line_type> selectByWriteUid(@Param("id") Serializable id) ;
+
 
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/mapper/Hr_skillMapper.java

+package cn.ibizlab.businesscentral.core.odoo_hr.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.*;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.HashMap;
+import org.apache.ibatis.annotations.Select;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skillSearchContext;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.alibaba.fastjson.JSONObject;
+
+public interface Hr_skillMapper extends BaseMapper<Hr_skill>{
+
+    Page<Hr_skill> searchDefault(IPage page, @Param("srf") Hr_skillSearchContext context, @Param("ew") Wrapper<Hr_skill> wrapper) ;
+    @Override
+    Hr_skill selectById(Serializable id);
+    @Override
+    int insert(Hr_skill entity);
+    @Override
+    int updateById(@Param(Constants.ENTITY) Hr_skill entity);
+    @Override
+    int update(@Param(Constants.ENTITY) Hr_skill entity, @Param("ew") Wrapper<Hr_skill> updateWrapper);
+    @Override
+    int deleteById(Serializable id);
+     /**
+      * 自定义查询SQL
+      * @param sql
+      * @return
+      */
+     @Select("${sql}")
+     List<JSONObject> selectBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义更新SQL
+    * @param sql
+    * @return
+    */
+    @Update("${sql}")
+    boolean updateBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义插入SQL
+    * @param sql
+    * @return
+    */
+    @Insert("${sql}")
+    boolean insertBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义删除SQL
+    * @param sql
+    * @return
+    */
+    @Delete("${sql}")
+    boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    List<Hr_skill> selectBySkillTypeId(@Param("id") Serializable id) ;
+
+    List<Hr_skill> selectByCreateUid(@Param("id") Serializable id) ;
+
+    List<Hr_skill> selectByWriteUid(@Param("id") Serializable id) ;
+
+
+}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/mapper/Hr_skill_levelMapper.java

+package cn.ibizlab.businesscentral.core.odoo_hr.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.*;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.HashMap;
+import org.apache.ibatis.annotations.Select;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_level;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skill_levelSearchContext;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.alibaba.fastjson.JSONObject;
+
+public interface Hr_skill_levelMapper extends BaseMapper<Hr_skill_level>{
+
+    Page<Hr_skill_level> searchDefault(IPage page, @Param("srf") Hr_skill_levelSearchContext context, @Param("ew") Wrapper<Hr_skill_level> wrapper) ;
+    @Override
+    Hr_skill_level selectById(Serializable id);
+    @Override
+    int insert(Hr_skill_level entity);
+    @Override
+    int updateById(@Param(Constants.ENTITY) Hr_skill_level entity);
+    @Override
+    int update(@Param(Constants.ENTITY) Hr_skill_level entity, @Param("ew") Wrapper<Hr_skill_level> updateWrapper);
+    @Override
+    int deleteById(Serializable id);
+     /**
+      * 自定义查询SQL
+      * @param sql
+      * @return
+      */
+     @Select("${sql}")
+     List<JSONObject> selectBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义更新SQL
+    * @param sql
+    * @return
+    */
+    @Update("${sql}")
+    boolean updateBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义插入SQL
+    * @param sql
+    * @return
+    */
+    @Insert("${sql}")
+    boolean insertBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义删除SQL
+    * @param sql
+    * @return
+    */
+    @Delete("${sql}")
+    boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    List<Hr_skill_level> selectBySkillTypeId(@Param("id") Serializable id) ;
+
+    List<Hr_skill_level> selectByCreateUid(@Param("id") Serializable id) ;
+
+    List<Hr_skill_level> selectByWriteUid(@Param("id") Serializable id) ;
+
+
+}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/mapper/Hr_skill_typeMapper.java

+package cn.ibizlab.businesscentral.core.odoo_hr.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.*;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.HashMap;
+import org.apache.ibatis.annotations.Select;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skill_typeSearchContext;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.alibaba.fastjson.JSONObject;
+
+public interface Hr_skill_typeMapper extends BaseMapper<Hr_skill_type>{
+
+    Page<Hr_skill_type> searchDefault(IPage page, @Param("srf") Hr_skill_typeSearchContext context, @Param("ew") Wrapper<Hr_skill_type> wrapper) ;
+    @Override
+    Hr_skill_type selectById(Serializable id);
+    @Override
+    int insert(Hr_skill_type entity);
+    @Override
+    int updateById(@Param(Constants.ENTITY) Hr_skill_type entity);
+    @Override
+    int update(@Param(Constants.ENTITY) Hr_skill_type entity, @Param("ew") Wrapper<Hr_skill_type> updateWrapper);
+    @Override
+    int deleteById(Serializable id);
+     /**
+      * 自定义查询SQL
+      * @param sql
+      * @return
+      */
+     @Select("${sql}")
+     List<JSONObject> selectBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义更新SQL
+    * @param sql
+    * @return
+    */
+    @Update("${sql}")
+    boolean updateBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义插入SQL
+    * @param sql
+    * @return
+    */
+    @Insert("${sql}")
+    boolean insertBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义删除SQL
+    * @param sql
+    * @return
+    */
+    @Delete("${sql}")
+    boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+
+}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/IHr_departmentService.java

@@ -37,6 +37,7 @@ public interface IHr_departmentService extends IService<Hr_department>{
     boolean save(Hr_department et) ;
     void saveBatch(List<Hr_department> list) ;
     Page<Hr_department> searchDefault(Hr_departmentSearchContext context) ;
+    Page<Hr_department> searchROOT(Hr_departmentSearchContext context) ;
     List<Hr_department> selectByParentId(Long id);
     void resetByParentId(Long id);
     void resetByParentId(Collection<Long> ids);

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/IHr_employee_skillService.java

+package cn.ibizlab.businesscentral.core.odoo_hr.service;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.math.BigInteger;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
+
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_employee_skill;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_employee_skillSearchContext;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 实体[Hr_employee_skill] 服务对象接口
+ */
+public interface IHr_employee_skillService extends IService<Hr_employee_skill>{
+
+    boolean create(Hr_employee_skill et) ;
+    void createBatch(List<Hr_employee_skill> list) ;
+    boolean update(Hr_employee_skill et) ;
+    void updateBatch(List<Hr_employee_skill> list) ;
+    boolean remove(Long key) ;
+    void removeBatch(Collection<Long> idList) ;
+    Hr_employee_skill get(Long key) ;
+    Hr_employee_skill getDraft(Hr_employee_skill et) ;
+    boolean checkKey(Hr_employee_skill et) ;
+    boolean save(Hr_employee_skill et) ;
+    void saveBatch(List<Hr_employee_skill> list) ;
+    Page<Hr_employee_skill> searchDefault(Hr_employee_skillSearchContext context) ;
+    List<Hr_employee_skill> selectByEmployeeId(Long id);
+    void removeByEmployeeId(Long id);
+    List<Hr_employee_skill> selectBySkillLevelId(Long id);
+    void removeBySkillLevelId(Long id);
+    List<Hr_employee_skill> selectBySkillId(Long id);
+    void removeBySkillId(Long id);
+    List<Hr_employee_skill> selectBySkillTypeId(Long id);
+    void removeBySkillTypeId(Long id);
+    List<Hr_employee_skill> selectByCreateUid(Long id);
+    void removeByCreateUid(Long id);
+    List<Hr_employee_skill> selectByWriteUid(Long id);
+    void removeByWriteUid(Long id);
+    /**
+     *自定义查询SQL
+     * @param sql  select * from table where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return select * from table where id = '1'
+     */
+    List<JSONObject> select(String sql, Map param);
+    /**
+     *自定义SQL
+     * @param sql  update table  set name ='test' where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return     update table  set name ='test' where id = '1'
+     */
+    boolean execute(String sql, Map param);
+
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/IHr_resume_lineService.java

@@ -43,6 +43,8 @@ public interface IHr_resume_lineService extends IService<Hr_resume_line>{
     void removeByLineTypeId(Long id);
     List<Hr_resume_line> selectByCreateUid(Long id);
     void removeByCreateUid(Long id);
+    List<Hr_resume_line> selectByWriteUid(Long id);
+    void removeByWriteUid(Long id);
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/IHr_resume_line_typeService.java

@@ -37,6 +37,10 @@ public interface IHr_resume_line_typeService extends IService<Hr_resume_line_typ
     boolean save(Hr_resume_line_type et) ;
     void saveBatch(List<Hr_resume_line_type> list) ;
     Page<Hr_resume_line_type> searchDefault(Hr_resume_line_typeSearchContext context) ;
+    List<Hr_resume_line_type> selectByCreateUid(Long id);
+    void removeByCreateUid(Long id);
+    List<Hr_resume_line_type> selectByWriteUid(Long id);
+    void removeByWriteUid(Long id);
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/IHr_skillService.java

+package cn.ibizlab.businesscentral.core.odoo_hr.service;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.math.BigInteger;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
+
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skillSearchContext;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 实体[Hr_skill] 服务对象接口
+ */
+public interface IHr_skillService extends IService<Hr_skill>{
+
+    boolean create(Hr_skill et) ;
+    void createBatch(List<Hr_skill> list) ;
+    boolean update(Hr_skill et) ;
+    void updateBatch(List<Hr_skill> list) ;
+    boolean remove(Long key) ;
+    void removeBatch(Collection<Long> idList) ;
+    Hr_skill get(Long key) ;
+    Hr_skill getDraft(Hr_skill et) ;
+    boolean checkKey(Hr_skill et) ;
+    boolean save(Hr_skill et) ;
+    void saveBatch(List<Hr_skill> list) ;
+    Page<Hr_skill> searchDefault(Hr_skillSearchContext context) ;
+    List<Hr_skill> selectBySkillTypeId(Long id);
+    void removeBySkillTypeId(Long id);
+    List<Hr_skill> selectByCreateUid(Long id);
+    void removeByCreateUid(Long id);
+    List<Hr_skill> selectByWriteUid(Long id);
+    void removeByWriteUid(Long id);
+    /**
+     *自定义查询SQL
+     * @param sql  select * from table where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return select * from table where id = '1'
+     */
+    List<JSONObject> select(String sql, Map param);
+    /**
+     *自定义SQL
+     * @param sql  update table  set name ='test' where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return     update table  set name ='test' where id = '1'
+     */
+    boolean execute(String sql, Map param);
+
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/IHr_skill_levelService.java

+package cn.ibizlab.businesscentral.core.odoo_hr.service;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.math.BigInteger;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
+
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_level;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skill_levelSearchContext;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 实体[Hr_skill_level] 服务对象接口
+ */
+public interface IHr_skill_levelService extends IService<Hr_skill_level>{
+
+    boolean create(Hr_skill_level et) ;
+    void createBatch(List<Hr_skill_level> list) ;
+    boolean update(Hr_skill_level et) ;
+    void updateBatch(List<Hr_skill_level> list) ;
+    boolean remove(Long key) ;
+    void removeBatch(Collection<Long> idList) ;
+    Hr_skill_level get(Long key) ;
+    Hr_skill_level getDraft(Hr_skill_level et) ;
+    boolean checkKey(Hr_skill_level et) ;
+    boolean save(Hr_skill_level et) ;
+    void saveBatch(List<Hr_skill_level> list) ;
+    Page<Hr_skill_level> searchDefault(Hr_skill_levelSearchContext context) ;
+    List<Hr_skill_level> selectBySkillTypeId(Long id);
+    void removeBySkillTypeId(Long id);
+    List<Hr_skill_level> selectByCreateUid(Long id);
+    void removeByCreateUid(Long id);
+    List<Hr_skill_level> selectByWriteUid(Long id);
+    void removeByWriteUid(Long id);
+    /**
+     *自定义查询SQL
+     * @param sql  select * from table where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return select * from table where id = '1'
+     */
+    List<JSONObject> select(String sql, Map param);
+    /**
+     *自定义SQL
+     * @param sql  update table  set name ='test' where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return     update table  set name ='test' where id = '1'
+     */
+    boolean execute(String sql, Map param);
+
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/IHr_skill_typeService.java

+package cn.ibizlab.businesscentral.core.odoo_hr.service;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.math.BigInteger;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
+
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skill_typeSearchContext;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 实体[Hr_skill_type] 服务对象接口
+ */
+public interface IHr_skill_typeService extends IService<Hr_skill_type>{
+
+    boolean create(Hr_skill_type et) ;
+    void createBatch(List<Hr_skill_type> list) ;
+    boolean update(Hr_skill_type et) ;
+    void updateBatch(List<Hr_skill_type> list) ;
+    boolean remove(Long key) ;
+    void removeBatch(Collection<Long> idList) ;
+    Hr_skill_type get(Long key) ;
+    Hr_skill_type getDraft(Hr_skill_type et) ;
+    boolean checkKey(Hr_skill_type et) ;
+    boolean save(Hr_skill_type et) ;
+    void saveBatch(List<Hr_skill_type> list) ;
+    Page<Hr_skill_type> searchDefault(Hr_skill_typeSearchContext context) ;
+    /**
+     *自定义查询SQL
+     * @param sql  select * from table where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return select * from table where id = '1'
+     */
+    List<JSONObject> select(String sql, Map param);
+    /**
+     *自定义SQL
+     * @param sql  update table  set name ='test' where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return     update table  set name ='test' where id = '1'
+     */
+    boolean execute(String sql, Map param);
+
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/impl/Hr_departmentServiceImpl.java

@@ -333,6 +333,15 @@ public class Hr_departmentServiceImpl extends EBSServiceImpl<Hr_departmentMapper
         return new PageImpl<Hr_department>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
+    /**
+     * 查询集合 根节点部门查询
+     */
+    @Override
+    public Page<Hr_department> searchROOT(Hr_departmentSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Hr_department> pages=baseMapper.searchROOT(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Hr_department>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
 
 
     /**

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/impl/Hr_employeeServiceImpl.java

@@ -68,6 +68,9 @@ public class Hr_employeeServiceImpl extends EBSServiceImpl<Hr_employeeMapper, Hr
     @Autowired
     @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_departmentService hrDepartmentService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employee_skillService hrEmployeeSkillService;
 
     protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employeeService hrEmployeeService = this;
     @Autowired

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/impl/Hr_employee_skillServiceImpl.java

+package cn.ibizlab.businesscentral.core.odoo_hr.service.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+import java.math.BigInteger;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
+import cn.ibizlab.businesscentral.util.errors.BadRequestAlertException;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Lazy;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_employee_skill;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_employee_skillSearchContext;
+import cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employee_skillService;
+
+import cn.ibizlab.businesscentral.util.helper.CachedBeanCopier;
+import cn.ibizlab.businesscentral.util.helper.DEFieldCacheMap;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.ibizlab.businesscentral.core.util.helper.EBSServiceImpl;
+import cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_employee_skillMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.alibaba.fastjson.JSONObject;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * 实体[员工技能] 服务对象接口实现
+ */
+@Slf4j
+@Service("Hr_employee_skillServiceImpl")
+public class Hr_employee_skillServiceImpl extends EBSServiceImpl<Hr_employee_skillMapper, Hr_employee_skill> implements IHr_employee_skillService {
+
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employeeService hrEmployeeService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skill_levelService hrSkillLevelService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skillService hrSkillService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skill_typeService hrSkillTypeService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
+
+    protected int batchSize = 500;
+
+    public String getIrModel(){
+        return "hr.employee.skill" ;
+    }
+
+    private boolean messageinfo = false ;
+
+    public void setMessageInfo(boolean messageinfo){
+        this.messageinfo = messageinfo ;
+    }
+
+    @Override
+    @Transactional
+    public boolean create(Hr_employee_skill et) {
+        boolean mail_create_nosubscribe = et.get("mail_create_nosubscribe") != null;
+        boolean mail_create_nolog = et.get("mail_create_nolog") != null;
+        boolean mail_notrack = et.get("mail_notrack") != null;
+        fillParentData(et);
+        if(!this.retBool(this.baseMapper.insert(et)))
+            return false;
+        CachedBeanCopier.copy(get(et.getId()),et);
+
+        if (messageinfo && !mail_create_nosubscribe) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_followersExService.class).add_default_followers(this,et);
+        }
+
+        if (messageinfo && !mail_create_nolog) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_messageExService.class).add_default_create_message(this,et);
+        }
+
+        if (messageinfo && !mail_notrack) {
+
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void createBatch(List<Hr_employee_skill> list) {
+        list.forEach(item->fillParentData(item));
+        this.saveBatch(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean update(Hr_employee_skill et) {
+        Hr_employee_skill old = new Hr_employee_skill() ;
+        CachedBeanCopier.copy(get(et.getId()), old);
+        boolean mail_notrack = et.get("mail_notrack") != null;
+        fillParentData(et);
+         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("id",et.getId())))
+            return false;
+        CachedBeanCopier.copy(get(et.getId()),et);
+        if (messageinfo && !mail_notrack) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_tracking_valueExService.class).message_track(this,old,et);
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void updateBatch(List<Hr_employee_skill> list) {
+        list.forEach(item->fillParentData(item));
+        updateBatchById(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean remove(Long key) {
+        boolean result=removeById(key);
+        return result ;
+    }
+
+    @Override
+    @Transactional
+    public void removeBatch(Collection<Long> idList) {
+        removeByIds(idList);
+    }
+
+    @Override
+    @Transactional
+    public Hr_employee_skill get(Long key) {
+        Hr_employee_skill et = getById(key);
+        if(et==null){
+            et=new Hr_employee_skill();
+            et.setId(key);
+        }
+        else{
+        }
+        return et;
+    }
+
+    @Override
+    public Hr_employee_skill getDraft(Hr_employee_skill et) {
+        fillParentData(et);
+        return et;
+    }
+
+    @Override
+    public boolean checkKey(Hr_employee_skill et) {
+        return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
+    }
+    @Override
+    @Transactional
+    public boolean save(Hr_employee_skill et) {
+        if(!saveOrUpdate(et))
+            return false;
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public boolean saveOrUpdate(Hr_employee_skill et) {
+        if (null == et) {
+            return false;
+        } else {
+            return checkKey(et) ? this.update(et) : this.create(et);
+        }
+    }
+
+    @Override
+    @Transactional
+    public boolean saveBatch(Collection<Hr_employee_skill> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void saveBatch(List<Hr_employee_skill> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+    }
+
+
+	@Override
+    public List<Hr_employee_skill> selectByEmployeeId(Long id) {
+        return baseMapper.selectByEmployeeId(id);
+    }
+    @Override
+    public void removeByEmployeeId(Long id) {
+        this.remove(new QueryWrapper<Hr_employee_skill>().eq("employee_id",id));
+    }
+
+	@Override
+    public List<Hr_employee_skill> selectBySkillLevelId(Long id) {
+        return baseMapper.selectBySkillLevelId(id);
+    }
+    @Override
+    public void removeBySkillLevelId(Long id) {
+        this.remove(new QueryWrapper<Hr_employee_skill>().eq("skill_level_id",id));
+    }
+
+	@Override
+    public List<Hr_employee_skill> selectBySkillId(Long id) {
+        return baseMapper.selectBySkillId(id);
+    }
+    @Override
+    public void removeBySkillId(Long id) {
+        this.remove(new QueryWrapper<Hr_employee_skill>().eq("skill_id",id));
+    }
+
+	@Override
+    public List<Hr_employee_skill> selectBySkillTypeId(Long id) {
+        return baseMapper.selectBySkillTypeId(id);
+    }
+    @Override
+    public void removeBySkillTypeId(Long id) {
+        this.remove(new QueryWrapper<Hr_employee_skill>().eq("skill_type_id",id));
+    }
+
+	@Override
+    public List<Hr_employee_skill> selectByCreateUid(Long id) {
+        return baseMapper.selectByCreateUid(id);
+    }
+    @Override
+    public void removeByCreateUid(Long id) {
+        this.remove(new QueryWrapper<Hr_employee_skill>().eq("create_uid",id));
+    }
+
+	@Override
+    public List<Hr_employee_skill> selectByWriteUid(Long id) {
+        return baseMapper.selectByWriteUid(id);
+    }
+    @Override
+    public void removeByWriteUid(Long id) {
+        this.remove(new QueryWrapper<Hr_employee_skill>().eq("write_uid",id));
+    }
+
+
+    /**
+     * 查询集合 数据集
+     */
+    @Override
+    public Page<Hr_employee_skill> searchDefault(Hr_employee_skillSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Hr_employee_skill> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Hr_employee_skill>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+
+
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(Hr_employee_skill et){
+        //实体关系[DER1N_HR_EMPLOYEE_SKILL_HR_EMPLOYEE_EMPLOYEE_ID]
+        if(!ObjectUtils.isEmpty(et.getEmployeeId())){
+            cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_employee odooEmployee=et.getOdooEmployee();
+            if(ObjectUtils.isEmpty(odooEmployee)){
+                cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_employee majorEntity=hrEmployeeService.get(et.getEmployeeId());
+                et.setOdooEmployee(majorEntity);
+                odooEmployee=majorEntity;
+            }
+            et.setEmployeeName(odooEmployee.getName());
+        }
+        //实体关系[DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_LEVEL_SKILL_LEVEL_ID]
+        if(!ObjectUtils.isEmpty(et.getSkillLevelId())){
+            cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_level odooSkillLevel=et.getOdooSkillLevel();
+            if(ObjectUtils.isEmpty(odooSkillLevel)){
+                cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_level majorEntity=hrSkillLevelService.get(et.getSkillLevelId());
+                et.setOdooSkillLevel(majorEntity);
+                odooSkillLevel=majorEntity;
+            }
+            et.setSkillLevelName(odooSkillLevel.getName());
+        }
+        //实体关系[DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_SKILL_ID]
+        if(!ObjectUtils.isEmpty(et.getSkillId())){
+            cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill odooSkill=et.getOdooSkill();
+            if(ObjectUtils.isEmpty(odooSkill)){
+                cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill majorEntity=hrSkillService.get(et.getSkillId());
+                et.setOdooSkill(majorEntity);
+                odooSkill=majorEntity;
+            }
+            et.setSkillName(odooSkill.getName());
+        }
+        //实体关系[DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID]
+        if(!ObjectUtils.isEmpty(et.getSkillTypeId())){
+            cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type odooSkillType=et.getOdooSkillType();
+            if(ObjectUtils.isEmpty(odooSkillType)){
+                cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type majorEntity=hrSkillTypeService.get(et.getSkillTypeId());
+                et.setOdooSkillType(majorEntity);
+                odooSkillType=majorEntity;
+            }
+            et.setSkillTypeName(odooSkillType.getName());
+        }
+    }
+
+
+
+
+    @Override
+    public List<JSONObject> select(String sql, Map param){
+        return this.baseMapper.selectBySQL(sql,param);
+    }
+
+    @Override
+    @Transactional
+    public boolean execute(String sql , Map param){
+        if (sql == null || sql.isEmpty()) {
+            return false;
+        }
+        if (sql.toLowerCase().trim().startsWith("insert")) {
+            return this.baseMapper.insertBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("update")) {
+            return this.baseMapper.updateBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("delete")) {
+            return this.baseMapper.deleteBySQL(sql,param);
+        }
+        log.warn("暂未支持的SQL语法");
+        return true;
+    }
+
+
+
+
+}
+
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/impl/Hr_resume_lineServiceImpl.java

@@ -224,6 +224,15 @@ public class Hr_resume_lineServiceImpl extends EBSServiceImpl<Hr_resume_lineMapp
         this.remove(new QueryWrapper<Hr_resume_line>().eq("create_uid",id));
     }
 
+	@Override
+    public List<Hr_resume_line> selectByWriteUid(Long id) {
+        return baseMapper.selectByWriteUid(id);
+    }
+    @Override
+    public void removeByWriteUid(Long id) {
+        this.remove(new QueryWrapper<Hr_resume_line>().eq("write_uid",id));
+    }
+
 
     /**
      * 查询集合 数据集

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/impl/Hr_resume_line_typeServiceImpl.java

@@ -53,6 +53,9 @@ public class Hr_resume_line_typeServiceImpl extends EBSServiceImpl<Hr_resume_lin
     @Autowired
     @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_resume_lineService hrResumeLineService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
 
     protected int batchSize = 500;
 
@@ -184,6 +187,24 @@ public class Hr_resume_line_typeServiceImpl extends EBSServiceImpl<Hr_resume_lin
     }
 
 
+	@Override
+    public List<Hr_resume_line_type> selectByCreateUid(Long id) {
+        return baseMapper.selectByCreateUid(id);
+    }
+    @Override
+    public void removeByCreateUid(Long id) {
+        this.remove(new QueryWrapper<Hr_resume_line_type>().eq("create_uid",id));
+    }
+
+	@Override
+    public List<Hr_resume_line_type> selectByWriteUid(Long id) {
+        return baseMapper.selectByWriteUid(id);
+    }
+    @Override
+    public void removeByWriteUid(Long id) {
+        this.remove(new QueryWrapper<Hr_resume_line_type>().eq("write_uid",id));
+    }
+
 
     /**
      * 查询集合 数据集

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/impl/Hr_skillServiceImpl.java

+package cn.ibizlab.businesscentral.core.odoo_hr.service.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+import java.math.BigInteger;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
+import cn.ibizlab.businesscentral.util.errors.BadRequestAlertException;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Lazy;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skillSearchContext;
+import cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skillService;
+
+import cn.ibizlab.businesscentral.util.helper.CachedBeanCopier;
+import cn.ibizlab.businesscentral.util.helper.DEFieldCacheMap;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.ibizlab.businesscentral.core.util.helper.EBSServiceImpl;
+import cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_skillMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.alibaba.fastjson.JSONObject;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * 实体[技能] 服务对象接口实现
+ */
+@Slf4j
+@Service("Hr_skillServiceImpl")
+public class Hr_skillServiceImpl extends EBSServiceImpl<Hr_skillMapper, Hr_skill> implements IHr_skillService {
+
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employee_skillService hrEmployeeSkillService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skill_typeService hrSkillTypeService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
+
+    protected int batchSize = 500;
+
+    public String getIrModel(){
+        return "hr.skill" ;
+    }
+
+    private boolean messageinfo = false ;
+
+    public void setMessageInfo(boolean messageinfo){
+        this.messageinfo = messageinfo ;
+    }
+
+    @Override
+    @Transactional
+    public boolean create(Hr_skill et) {
+        boolean mail_create_nosubscribe = et.get("mail_create_nosubscribe") != null;
+        boolean mail_create_nolog = et.get("mail_create_nolog") != null;
+        boolean mail_notrack = et.get("mail_notrack") != null;
+        fillParentData(et);
+        if(!this.retBool(this.baseMapper.insert(et)))
+            return false;
+        CachedBeanCopier.copy(get(et.getId()),et);
+
+        if (messageinfo && !mail_create_nosubscribe) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_followersExService.class).add_default_followers(this,et);
+        }
+
+        if (messageinfo && !mail_create_nolog) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_messageExService.class).add_default_create_message(this,et);
+        }
+
+        if (messageinfo && !mail_notrack) {
+
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void createBatch(List<Hr_skill> list) {
+        list.forEach(item->fillParentData(item));
+        this.saveBatch(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean update(Hr_skill et) {
+        Hr_skill old = new Hr_skill() ;
+        CachedBeanCopier.copy(get(et.getId()), old);
+        boolean mail_notrack = et.get("mail_notrack") != null;
+        fillParentData(et);
+         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("id",et.getId())))
+            return false;
+        CachedBeanCopier.copy(get(et.getId()),et);
+        if (messageinfo && !mail_notrack) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_tracking_valueExService.class).message_track(this,old,et);
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void updateBatch(List<Hr_skill> list) {
+        list.forEach(item->fillParentData(item));
+        updateBatchById(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean remove(Long key) {
+        boolean result=removeById(key);
+        return result ;
+    }
+
+    @Override
+    @Transactional
+    public void removeBatch(Collection<Long> idList) {
+        removeByIds(idList);
+    }
+
+    @Override
+    @Transactional
+    public Hr_skill get(Long key) {
+        Hr_skill et = getById(key);
+        if(et==null){
+            et=new Hr_skill();
+            et.setId(key);
+        }
+        else{
+        }
+        return et;
+    }
+
+    @Override
+    public Hr_skill getDraft(Hr_skill et) {
+        fillParentData(et);
+        return et;
+    }
+
+    @Override
+    public boolean checkKey(Hr_skill et) {
+        return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
+    }
+    @Override
+    @Transactional
+    public boolean save(Hr_skill et) {
+        if(!saveOrUpdate(et))
+            return false;
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public boolean saveOrUpdate(Hr_skill et) {
+        if (null == et) {
+            return false;
+        } else {
+            return checkKey(et) ? this.update(et) : this.create(et);
+        }
+    }
+
+    @Override
+    @Transactional
+    public boolean saveBatch(Collection<Hr_skill> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void saveBatch(List<Hr_skill> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+    }
+
+
+	@Override
+    public List<Hr_skill> selectBySkillTypeId(Long id) {
+        return baseMapper.selectBySkillTypeId(id);
+    }
+    @Override
+    public void removeBySkillTypeId(Long id) {
+        this.remove(new QueryWrapper<Hr_skill>().eq("skill_type_id",id));
+    }
+
+	@Override
+    public List<Hr_skill> selectByCreateUid(Long id) {
+        return baseMapper.selectByCreateUid(id);
+    }
+    @Override
+    public void removeByCreateUid(Long id) {
+        this.remove(new QueryWrapper<Hr_skill>().eq("create_uid",id));
+    }
+
+	@Override
+    public List<Hr_skill> selectByWriteUid(Long id) {
+        return baseMapper.selectByWriteUid(id);
+    }
+    @Override
+    public void removeByWriteUid(Long id) {
+        this.remove(new QueryWrapper<Hr_skill>().eq("write_uid",id));
+    }
+
+
+    /**
+     * 查询集合 数据集
+     */
+    @Override
+    public Page<Hr_skill> searchDefault(Hr_skillSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Hr_skill> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Hr_skill>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+
+
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(Hr_skill et){
+        //实体关系[DER1N_HR_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID]
+        if(!ObjectUtils.isEmpty(et.getSkillTypeId())){
+            cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type odooSkillType=et.getOdooSkillType();
+            if(ObjectUtils.isEmpty(odooSkillType)){
+                cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type majorEntity=hrSkillTypeService.get(et.getSkillTypeId());
+                et.setOdooSkillType(majorEntity);
+                odooSkillType=majorEntity;
+            }
+            et.setSkillTypeName(odooSkillType.getName());
+        }
+    }
+
+
+
+
+    @Override
+    public List<JSONObject> select(String sql, Map param){
+        return this.baseMapper.selectBySQL(sql,param);
+    }
+
+    @Override
+    @Transactional
+    public boolean execute(String sql , Map param){
+        if (sql == null || sql.isEmpty()) {
+            return false;
+        }
+        if (sql.toLowerCase().trim().startsWith("insert")) {
+            return this.baseMapper.insertBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("update")) {
+            return this.baseMapper.updateBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("delete")) {
+            return this.baseMapper.deleteBySQL(sql,param);
+        }
+        log.warn("暂未支持的SQL语法");
+        return true;
+    }
+
+
+
+
+}
+
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/impl/Hr_skill_levelServiceImpl.java

+package cn.ibizlab.businesscentral.core.odoo_hr.service.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+import java.math.BigInteger;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
+import cn.ibizlab.businesscentral.util.errors.BadRequestAlertException;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Lazy;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_level;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skill_levelSearchContext;
+import cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skill_levelService;
+
+import cn.ibizlab.businesscentral.util.helper.CachedBeanCopier;
+import cn.ibizlab.businesscentral.util.helper.DEFieldCacheMap;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.ibizlab.businesscentral.core.util.helper.EBSServiceImpl;
+import cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_skill_levelMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.alibaba.fastjson.JSONObject;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * 实体[技能等级] 服务对象接口实现
+ */
+@Slf4j
+@Service("Hr_skill_levelServiceImpl")
+public class Hr_skill_levelServiceImpl extends EBSServiceImpl<Hr_skill_levelMapper, Hr_skill_level> implements IHr_skill_levelService {
+
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employee_skillService hrEmployeeSkillService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skill_typeService hrSkillTypeService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
+
+    protected int batchSize = 500;
+
+    public String getIrModel(){
+        return "hr.skill.level" ;
+    }
+
+    private boolean messageinfo = false ;
+
+    public void setMessageInfo(boolean messageinfo){
+        this.messageinfo = messageinfo ;
+    }
+
+    @Override
+    @Transactional
+    public boolean create(Hr_skill_level et) {
+        boolean mail_create_nosubscribe = et.get("mail_create_nosubscribe") != null;
+        boolean mail_create_nolog = et.get("mail_create_nolog") != null;
+        boolean mail_notrack = et.get("mail_notrack") != null;
+        fillParentData(et);
+        if(!this.retBool(this.baseMapper.insert(et)))
+            return false;
+        CachedBeanCopier.copy(get(et.getId()),et);
+
+        if (messageinfo && !mail_create_nosubscribe) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_followersExService.class).add_default_followers(this,et);
+        }
+
+        if (messageinfo && !mail_create_nolog) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_messageExService.class).add_default_create_message(this,et);
+        }
+
+        if (messageinfo && !mail_notrack) {
+
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void createBatch(List<Hr_skill_level> list) {
+        list.forEach(item->fillParentData(item));
+        this.saveBatch(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean update(Hr_skill_level et) {
+        Hr_skill_level old = new Hr_skill_level() ;
+        CachedBeanCopier.copy(get(et.getId()), old);
+        boolean mail_notrack = et.get("mail_notrack") != null;
+        fillParentData(et);
+         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("id",et.getId())))
+            return false;
+        CachedBeanCopier.copy(get(et.getId()),et);
+        if (messageinfo && !mail_notrack) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_tracking_valueExService.class).message_track(this,old,et);
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void updateBatch(List<Hr_skill_level> list) {
+        list.forEach(item->fillParentData(item));
+        updateBatchById(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean remove(Long key) {
+        boolean result=removeById(key);
+        return result ;
+    }
+
+    @Override
+    @Transactional
+    public void removeBatch(Collection<Long> idList) {
+        removeByIds(idList);
+    }
+
+    @Override
+    @Transactional
+    public Hr_skill_level get(Long key) {
+        Hr_skill_level et = getById(key);
+        if(et==null){
+            et=new Hr_skill_level();
+            et.setId(key);
+        }
+        else{
+        }
+        return et;
+    }
+
+    @Override
+    public Hr_skill_level getDraft(Hr_skill_level et) {
+        fillParentData(et);
+        return et;
+    }
+
+    @Override
+    public boolean checkKey(Hr_skill_level et) {
+        return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
+    }
+    @Override
+    @Transactional
+    public boolean save(Hr_skill_level et) {
+        if(!saveOrUpdate(et))
+            return false;
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public boolean saveOrUpdate(Hr_skill_level et) {
+        if (null == et) {
+            return false;
+        } else {
+            return checkKey(et) ? this.update(et) : this.create(et);
+        }
+    }
+
+    @Override
+    @Transactional
+    public boolean saveBatch(Collection<Hr_skill_level> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void saveBatch(List<Hr_skill_level> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+    }
+
+
+	@Override
+    public List<Hr_skill_level> selectBySkillTypeId(Long id) {
+        return baseMapper.selectBySkillTypeId(id);
+    }
+    @Override
+    public void removeBySkillTypeId(Long id) {
+        this.remove(new QueryWrapper<Hr_skill_level>().eq("skill_type_id",id));
+    }
+
+	@Override
+    public List<Hr_skill_level> selectByCreateUid(Long id) {
+        return baseMapper.selectByCreateUid(id);
+    }
+    @Override
+    public void removeByCreateUid(Long id) {
+        this.remove(new QueryWrapper<Hr_skill_level>().eq("create_uid",id));
+    }
+
+	@Override
+    public List<Hr_skill_level> selectByWriteUid(Long id) {
+        return baseMapper.selectByWriteUid(id);
+    }
+    @Override
+    public void removeByWriteUid(Long id) {
+        this.remove(new QueryWrapper<Hr_skill_level>().eq("write_uid",id));
+    }
+
+
+    /**
+     * 查询集合 数据集
+     */
+    @Override
+    public Page<Hr_skill_level> searchDefault(Hr_skill_levelSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Hr_skill_level> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Hr_skill_level>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+
+
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(Hr_skill_level et){
+        //实体关系[DER1N_HR_SKILL_LEVEL_HR_SKILL_TYPE_SKILL_TYPE_ID]
+        if(!ObjectUtils.isEmpty(et.getSkillTypeId())){
+            cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type odooSkillType=et.getOdooSkillType();
+            if(ObjectUtils.isEmpty(odooSkillType)){
+                cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type majorEntity=hrSkillTypeService.get(et.getSkillTypeId());
+                et.setOdooSkillType(majorEntity);
+                odooSkillType=majorEntity;
+            }
+            et.setSkillTypeName(odooSkillType.getName());
+        }
+    }
+
+
+
+
+    @Override
+    public List<JSONObject> select(String sql, Map param){
+        return this.baseMapper.selectBySQL(sql,param);
+    }
+
+    @Override
+    @Transactional
+    public boolean execute(String sql , Map param){
+        if (sql == null || sql.isEmpty()) {
+            return false;
+        }
+        if (sql.toLowerCase().trim().startsWith("insert")) {
+            return this.baseMapper.insertBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("update")) {
+            return this.baseMapper.updateBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("delete")) {
+            return this.baseMapper.deleteBySQL(sql,param);
+        }
+        log.warn("暂未支持的SQL语法");
+        return true;
+    }
+
+
+
+
+}
+
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/impl/Hr_skill_typeServiceImpl.java

+package cn.ibizlab.businesscentral.core.odoo_hr.service.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+import java.math.BigInteger;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
+import cn.ibizlab.businesscentral.util.errors.BadRequestAlertException;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Lazy;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skill_typeSearchContext;
+import cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skill_typeService;
+
+import cn.ibizlab.businesscentral.util.helper.CachedBeanCopier;
+import cn.ibizlab.businesscentral.util.helper.DEFieldCacheMap;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.ibizlab.businesscentral.core.util.helper.EBSServiceImpl;
+import cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_skill_typeMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.alibaba.fastjson.JSONObject;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * 实体[技能类型] 服务对象接口实现
+ */
+@Slf4j
+@Service("Hr_skill_typeServiceImpl")
+public class Hr_skill_typeServiceImpl extends EBSServiceImpl<Hr_skill_typeMapper, Hr_skill_type> implements IHr_skill_typeService {
+
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_employee_skillService hrEmployeeSkillService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skillService hrSkillService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skill_levelService hrSkillLevelService;
+
+    protected int batchSize = 500;
+
+    public String getIrModel(){
+        return "hr.skill.type" ;
+    }
+
+    private boolean messageinfo = false ;
+
+    public void setMessageInfo(boolean messageinfo){
+        this.messageinfo = messageinfo ;
+    }
+
+    @Override
+    @Transactional
+    public boolean create(Hr_skill_type et) {
+        boolean mail_create_nosubscribe = et.get("mail_create_nosubscribe") != null;
+        boolean mail_create_nolog = et.get("mail_create_nolog") != null;
+        boolean mail_notrack = et.get("mail_notrack") != null;
+        if(!this.retBool(this.baseMapper.insert(et)))
+            return false;
+        CachedBeanCopier.copy(get(et.getId()),et);
+
+        if (messageinfo && !mail_create_nosubscribe) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_followersExService.class).add_default_followers(this,et);
+        }
+
+        if (messageinfo && !mail_create_nolog) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_messageExService.class).add_default_create_message(this,et);
+        }
+
+        if (messageinfo && !mail_notrack) {
+
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void createBatch(List<Hr_skill_type> list) {
+        this.saveBatch(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean update(Hr_skill_type et) {
+        Hr_skill_type old = new Hr_skill_type() ;
+        CachedBeanCopier.copy(get(et.getId()), old);
+        boolean mail_notrack = et.get("mail_notrack") != null;
+         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("id",et.getId())))
+            return false;
+        CachedBeanCopier.copy(get(et.getId()),et);
+        if (messageinfo && !mail_notrack) {
+            cn.ibizlab.businesscentral.util.security.SpringContextHolder.getBean(cn.ibizlab.businesscentral.core.extensions.service.Mail_tracking_valueExService.class).message_track(this,old,et);
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void updateBatch(List<Hr_skill_type> list) {
+        updateBatchById(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean remove(Long key) {
+        boolean result=removeById(key);
+        return result ;
+    }
+
+    @Override
+    @Transactional
+    public void removeBatch(Collection<Long> idList) {
+        removeByIds(idList);
+    }
+
+    @Override
+    @Transactional
+    public Hr_skill_type get(Long key) {
+        Hr_skill_type et = getById(key);
+        if(et==null){
+            et=new Hr_skill_type();
+            et.setId(key);
+        }
+        else{
+        }
+        return et;
+    }
+
+    @Override
+    public Hr_skill_type getDraft(Hr_skill_type et) {
+        return et;
+    }
+
+    @Override
+    public boolean checkKey(Hr_skill_type et) {
+        return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
+    }
+    @Override
+    @Transactional
+    public boolean save(Hr_skill_type et) {
+        if(!saveOrUpdate(et))
+            return false;
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public boolean saveOrUpdate(Hr_skill_type et) {
+        if (null == et) {
+            return false;
+        } else {
+            return checkKey(et) ? this.update(et) : this.create(et);
+        }
+    }
+
+    @Override
+    @Transactional
+    public boolean saveBatch(Collection<Hr_skill_type> list) {
+        saveOrUpdateBatch(list,batchSize);
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void saveBatch(List<Hr_skill_type> list) {
+        saveOrUpdateBatch(list,batchSize);
+    }
+
+
+
+    /**
+     * 查询集合 数据集
+     */
+    @Override
+    public Page<Hr_skill_type> searchDefault(Hr_skill_typeSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Hr_skill_type> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Hr_skill_type>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+
+
+
+
+
+
+    @Override
+    public List<JSONObject> select(String sql, Map param){
+        return this.baseMapper.selectBySQL(sql,param);
+    }
+
+    @Override
+    @Transactional
+    public boolean execute(String sql , Map param){
+        if (sql == null || sql.isEmpty()) {
+            return false;
+        }
+        if (sql.toLowerCase().trim().startsWith("insert")) {
+            return this.baseMapper.insertBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("update")) {
+            return this.baseMapper.updateBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("delete")) {
+            return this.baseMapper.deleteBySQL(sql,param);
+        }
+        log.warn("暂未支持的SQL语法");
+        return true;
+    }
+
+
+
+
+}
+
+
+

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -462,6 +462,9 @@
     <!--输出实体[HR_EMPLOYEE_CATEGORY]数据结构 -->
 
 
+    <!--输出实体[HR_EMPLOYEE_SKILL]数据结构 -->
+
+
     <!--输出实体[HR_EXPENSE]数据结构 -->
 
 
@@ -510,6 +513,15 @@
     <!--输出实体[HR_RESUME_LINE_TYPE]数据结构 -->
 
 
+    <!--输出实体[HR_SKILL]数据结构 -->
+
+
+    <!--输出实体[HR_SKILL_LEVEL]数据结构 -->
+
+
+    <!--输出实体[HR_SKILL_TYPE]数据结构 -->
+
+
     <!--输出实体[IAP_ACCOUNT]数据结构 -->
 
 
@@ -1409,6 +1421,7 @@
         <!--输出实体[HR_DEPARTMENT]外键关系 -->
         <!--输出实体[HR_EMPLOYEE]外键关系 -->
         <!--输出实体[HR_EMPLOYEE_CATEGORY]外键关系 -->
+        <!--输出实体[HR_EMPLOYEE_SKILL]外键关系 -->
         <!--输出实体[HR_EXPENSE]外键关系 -->
         <!--输出实体[HR_EXPENSE_REFUSE_WIZARD]外键关系 -->
         <!--输出实体[HR_EXPENSE_SHEET]外键关系 -->
@@ -1425,6 +1438,9 @@
         <!--输出实体[HR_RECRUITMENT_STAGE]外键关系 -->
         <!--输出实体[HR_RESUME_LINE]外键关系 -->
         <!--输出实体[HR_RESUME_LINE_TYPE]外键关系 -->
+        <!--输出实体[HR_SKILL]外键关系 -->
+        <!--输出实体[HR_SKILL_LEVEL]外键关系 -->
+        <!--输出实体[HR_SKILL_TYPE]外键关系 -->
         <!--输出实体[IAP_ACCOUNT]外键关系 -->
         <!--输出实体[IM_LIVECHAT_CHANNEL]外键关系 -->
         <!--输出实体[IM_LIVECHAT_CHANNEL_RULE]外键关系 -->

businesscentral-core/src/main/resources/mapper/odoo_base/res_company/Res_companyMapper.xml

@@ -296,11 +296,26 @@
          <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
      </select>
 
+    <!--数据集合[ROOT]-->
+	 <select id="searchROOT"  parameterType="cn.ibizlab.businesscentral.core.odoo_base.filter.Res_companySearchContext"  resultMap="Res_companyResultMap">
+         select t1.* from (
+                <include refid="ROOT" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
 		<![CDATA[ SELECT t1.ACCOUNT_BANK_RECONCILIATION_START, t1.ACCOUNT_DASHBOARD_ONBOARDING_STATE, t1.ACCOUNT_INVOICE_ONBOARDING_STATE, t1.ACCOUNT_NO, t1.ACCOUNT_ONBOARDING_INVOICE_LAYOUT_STATE, t1.ACCOUNT_ONBOARDING_SALE_TAX_STATE, t1.ACCOUNT_ONBOARDING_SAMPLE_INVOICE_STATE, t61.DATE AS ACCOUNT_OPENING_DATE, t61.JOURNAL_ID AS ACCOUNT_OPENING_JOURNAL_ID, t1.ACCOUNT_OPENING_MOVE_ID, t61.NAME AS ACCOUNT_OPENING_MOVE_ID_TEXT, t1.ACCOUNT_PURCHASE_TAX_ID, t41.NAME AS ACCOUNT_PURCHASE_TAX_ID_TEXT, t1.ACCOUNT_SALE_TAX_ID, t121.NAME AS ACCOUNT_SALE_TAX_ID_TEXT, t1.ACCOUNT_SETUP_BANK_DATA_STATE, t1.ACCOUNT_SETUP_COA_STATE, t1.ACCOUNT_SETUP_FY_DATA_STATE, t1.ANGLO_SAXON_ACCOUNTING, t1.BANK_ACCOUNT_CODE_PREFIX, t1.BASE_ONBOARDING_COMPANY_STATE, t1.CASH_ACCOUNT_CODE_PREFIX, t1.CHART_TEMPLATE_ID, t111.NAME AS CHART_TEMPLATE_ID_TEXT, t1.COMPANY_REGISTRY, t1.CREATE_DATE, t1.CREATE_UID, t141.NAME AS CREATE_UID_TEXT, t1.CURRENCY_EXCHANGE_JOURNAL_ID, t11.NAME AS CURRENCY_EXCHANGE_JOURNAL_ID_TEXT, t1.CURRENCY_ID, t81.NAME AS CURRENCY_ID_TEXT, t21.EMAIL, t1.EXPECTS_CHART_OF_ACCOUNTS, t11.DEFAULT_DEBIT_ACCOUNT_ID AS EXPENSE_CURRENCY_EXCHANGE_ACCOUNT_ID, t1.EXTERNAL_REPORT_LAYOUT_ID, t1.FISCALYEAR_LAST_DAY, t1.FISCALYEAR_LAST_MONTH, t1.FISCALYEAR_LOCK_DATE, t1.ID, t11.DEFAULT_CREDIT_ACCOUNT_ID AS INCOME_CURRENCY_EXCHANGE_ACCOUNT_ID, t1.INCOTERM_ID, t51.NAME AS INCOTERM_ID_TEXT, t1.INTERNAL_TRANSIT_LOCATION_ID, t201.NAME AS INTERNAL_TRANSIT_LOCATION_ID_TEXT, t1.INVOICE_IS_EMAIL, t1.INVOICE_IS_PRINT, t1.INVOICE_IS_SNAILMAIL, t1.MANUFACTURING_LEAD, t21.NAME, t1.NOMENCLATURE_ID, t1.PAPERFORMAT_ID, t1.PARENT_ID, t181.NAME AS PARENT_ID_TEXT, t21.PARTNER_GID, t1.PARTNER_ID, t1.PAYMENT_ACQUIRER_ONBOARDING_STATE, t1.PAYMENT_ONBOARDING_PAYMENT_METHOD, t1.PERIOD_LOCK_DATE, t21.PHONE, t1.PORTAL_CONFIRMATION_PAY, t1.PORTAL_CONFIRMATION_SIGN, t1.PO_DOUBLE_VALIDATION, t1.PO_DOUBLE_VALIDATION_AMOUNT, t1.PO_LEAD, t1.PO_LOCK, t1.PROPERTY_STOCK_ACCOUNT_INPUT_CATEG_ID, t31.NAME AS PROPERTY_STOCK_ACCOUNT_INPUT_CATEG_ID_TEXT, t1.PROPERTY_STOCK_ACCOUNT_OUTPUT_CATEG_ID, t151.NAME AS PROPERTY_STOCK_ACCOUNT_OUTPUT_CATEG_ID_TEXT, t1.PROPERTY_STOCK_VALUATION_ACCOUNT_ID, t161.NAME AS PROPERTY_STOCK_VALUATION_ACCOUNT_ID_TEXT, t1.QR_CODE, t1.QUOTATION_VALIDITY_DAYS, t1.RESOURCE_CALENDAR_ID, t211.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.SALE_ONBOARDING_ORDER_CONFIRMATION_STATE, t1.SALE_ONBOARDING_PAYMENT_METHOD, t1.SALE_ONBOARDING_SAMPLE_QUOTATION_STATE, t1.SALE_QUOTATION_ONBOARDING_STATE, t1.SECURITY_LEAD, t1.SEQUENCE, t1.SNAILMAIL_COLOR, t1.SNAILMAIL_DUPLEX, t1.SOCIAL_FACEBOOK, t1.SOCIAL_GITHUB, t1.SOCIAL_INSTAGRAM, t1.SOCIAL_LINKEDIN, t1.SOCIAL_TWITTER, t1.SOCIAL_YOUTUBE, t1.TAX_CALCULATION_ROUNDING_METHOD, t1.TAX_CASH_BASIS_JOURNAL_ID, t191.NAME AS TAX_CASH_BASIS_JOURNAL_ID_TEXT, t1.TAX_EXIGIBILITY, t1.TRANSFER_ACCOUNT_CODE_PREFIX, t1.TRANSFER_ACCOUNT_ID, t71.NAME AS TRANSFER_ACCOUNT_ID_TEXT, t21.VAT, t21.WEBSITE, t1.WEBSITE_SALE_ONBOARDING_PAYMENT_ACQUIRER_STATE, t1.WRITE_DATE, t1.WRITE_UID, t101.NAME AS WRITE_UID_TEXT FROM RES_COMPANY t1  LEFT JOIN ACCOUNT_JOURNAL t11 ON t1.CURRENCY_EXCHANGE_JOURNAL_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t1.PARTNER_ID = t21.ID  LEFT JOIN ACCOUNT_ACCOUNT t31 ON t1.PROPERTY_STOCK_ACCOUNT_INPUT_CATEG_ID = t31.ID  LEFT JOIN ACCOUNT_TAX t41 ON t1.ACCOUNT_PURCHASE_TAX_ID = t41.ID  LEFT JOIN ACCOUNT_INCOTERMS t51 ON t1.INCOTERM_ID = t51.ID  LEFT JOIN ACCOUNT_MOVE t61 ON t1.ACCOUNT_OPENING_MOVE_ID = t61.ID  LEFT JOIN ACCOUNT_ACCOUNT t71 ON t1.TRANSFER_ACCOUNT_ID = t71.ID  LEFT JOIN RES_CURRENCY t81 ON t1.CURRENCY_ID = t81.ID  LEFT JOIN RES_USERS t91 ON t1.WRITE_UID = t91.ID  LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID  LEFT JOIN ACCOUNT_CHART_TEMPLATE t111 ON t1.CHART_TEMPLATE_ID = t111.ID  LEFT JOIN ACCOUNT_TAX t121 ON t1.ACCOUNT_SALE_TAX_ID = t121.ID  LEFT JOIN RES_USERS t131 ON t1.CREATE_UID = t131.ID  LEFT JOIN RES_PARTNER t141 ON t131.PARTNER_ID = t141.ID  LEFT JOIN ACCOUNT_ACCOUNT t151 ON t1.PROPERTY_STOCK_ACCOUNT_OUTPUT_CATEG_ID = t151.ID  LEFT JOIN ACCOUNT_ACCOUNT t161 ON t1.PROPERTY_STOCK_VALUATION_ACCOUNT_ID = t161.ID  LEFT JOIN RES_COMPANY t171 ON t1.PARENT_ID = t171.ID  LEFT JOIN RES_PARTNER t181 ON t171.PARTNER_ID = t181.ID  LEFT JOIN ACCOUNT_JOURNAL t191 ON t1.TAX_CASH_BASIS_JOURNAL_ID = t191.ID  LEFT JOIN STOCK_LOCATION t201 ON t1.INTERNAL_TRANSIT_LOCATION_ID = t201.ID  LEFT JOIN RESOURCE_CALENDAR t211 ON t1.RESOURCE_CALENDAR_ID = t211.ID  
 			]]>
     </sql>
+    <!--数据查询[ROOT]-->
+    <sql id="ROOT" databaseId="postgresql">
+		<![CDATA[ SELECT t1.ACCOUNT_BANK_RECONCILIATION_START, t1.ACCOUNT_DASHBOARD_ONBOARDING_STATE, t1.ACCOUNT_INVOICE_ONBOARDING_STATE, t1.ACCOUNT_NO, t1.ACCOUNT_ONBOARDING_INVOICE_LAYOUT_STATE, t1.ACCOUNT_ONBOARDING_SALE_TAX_STATE, t1.ACCOUNT_ONBOARDING_SAMPLE_INVOICE_STATE, t61.DATE AS ACCOUNT_OPENING_DATE, t61.JOURNAL_ID AS ACCOUNT_OPENING_JOURNAL_ID, t1.ACCOUNT_OPENING_MOVE_ID, t61.NAME AS ACCOUNT_OPENING_MOVE_ID_TEXT, t1.ACCOUNT_PURCHASE_TAX_ID, t41.NAME AS ACCOUNT_PURCHASE_TAX_ID_TEXT, t1.ACCOUNT_SALE_TAX_ID, t121.NAME AS ACCOUNT_SALE_TAX_ID_TEXT, t1.ACCOUNT_SETUP_BANK_DATA_STATE, t1.ACCOUNT_SETUP_COA_STATE, t1.ACCOUNT_SETUP_FY_DATA_STATE, t1.ANGLO_SAXON_ACCOUNTING, t1.BANK_ACCOUNT_CODE_PREFIX, t1.BASE_ONBOARDING_COMPANY_STATE, t1.CASH_ACCOUNT_CODE_PREFIX, t1.CHART_TEMPLATE_ID, t111.NAME AS CHART_TEMPLATE_ID_TEXT, t1.COMPANY_REGISTRY, t1.CREATE_DATE, t1.CREATE_UID, t141.NAME AS CREATE_UID_TEXT, t1.CURRENCY_EXCHANGE_JOURNAL_ID, t11.NAME AS CURRENCY_EXCHANGE_JOURNAL_ID_TEXT, t1.CURRENCY_ID, t81.NAME AS CURRENCY_ID_TEXT, t21.EMAIL, t1.EXPECTS_CHART_OF_ACCOUNTS, t11.DEFAULT_DEBIT_ACCOUNT_ID AS EXPENSE_CURRENCY_EXCHANGE_ACCOUNT_ID, t1.EXTERNAL_REPORT_LAYOUT_ID, t1.FISCALYEAR_LAST_DAY, t1.FISCALYEAR_LAST_MONTH, t1.FISCALYEAR_LOCK_DATE, t1.ID, t11.DEFAULT_CREDIT_ACCOUNT_ID AS INCOME_CURRENCY_EXCHANGE_ACCOUNT_ID, t1.INCOTERM_ID, t51.NAME AS INCOTERM_ID_TEXT, t1.INTERNAL_TRANSIT_LOCATION_ID, t201.NAME AS INTERNAL_TRANSIT_LOCATION_ID_TEXT, t1.INVOICE_IS_EMAIL, t1.INVOICE_IS_PRINT, t1.INVOICE_IS_SNAILMAIL, t1.MANUFACTURING_LEAD, t21.NAME, t1.NOMENCLATURE_ID, t1.PAPERFORMAT_ID, t1.PARENT_ID, t181.NAME AS PARENT_ID_TEXT, t21.PARTNER_GID, t1.PARTNER_ID, t1.PAYMENT_ACQUIRER_ONBOARDING_STATE, t1.PAYMENT_ONBOARDING_PAYMENT_METHOD, t1.PERIOD_LOCK_DATE, t21.PHONE, t1.PORTAL_CONFIRMATION_PAY, t1.PORTAL_CONFIRMATION_SIGN, t1.PO_DOUBLE_VALIDATION, t1.PO_DOUBLE_VALIDATION_AMOUNT, t1.PO_LEAD, t1.PO_LOCK, t1.PROPERTY_STOCK_ACCOUNT_INPUT_CATEG_ID, t31.NAME AS PROPERTY_STOCK_ACCOUNT_INPUT_CATEG_ID_TEXT, t1.PROPERTY_STOCK_ACCOUNT_OUTPUT_CATEG_ID, t151.NAME AS PROPERTY_STOCK_ACCOUNT_OUTPUT_CATEG_ID_TEXT, t1.PROPERTY_STOCK_VALUATION_ACCOUNT_ID, t161.NAME AS PROPERTY_STOCK_VALUATION_ACCOUNT_ID_TEXT, t1.QR_CODE, t1.QUOTATION_VALIDITY_DAYS, t1.RESOURCE_CALENDAR_ID, t211.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.SALE_ONBOARDING_ORDER_CONFIRMATION_STATE, t1.SALE_ONBOARDING_PAYMENT_METHOD, t1.SALE_ONBOARDING_SAMPLE_QUOTATION_STATE, t1.SALE_QUOTATION_ONBOARDING_STATE, t1.SECURITY_LEAD, t1.SEQUENCE, t1.SNAILMAIL_COLOR, t1.SNAILMAIL_DUPLEX, t1.SOCIAL_FACEBOOK, t1.SOCIAL_GITHUB, t1.SOCIAL_INSTAGRAM, t1.SOCIAL_LINKEDIN, t1.SOCIAL_TWITTER, t1.SOCIAL_YOUTUBE, t1.TAX_CALCULATION_ROUNDING_METHOD, t1.TAX_CASH_BASIS_JOURNAL_ID, t191.NAME AS TAX_CASH_BASIS_JOURNAL_ID_TEXT, t1.TAX_EXIGIBILITY, t1.TRANSFER_ACCOUNT_CODE_PREFIX, t1.TRANSFER_ACCOUNT_ID, t71.NAME AS TRANSFER_ACCOUNT_ID_TEXT, t21.VAT, t21.WEBSITE, t1.WEBSITE_SALE_ONBOARDING_PAYMENT_ACQUIRER_STATE, t1.WRITE_DATE, t1.WRITE_UID, t101.NAME AS WRITE_UID_TEXT FROM RES_COMPANY t1  LEFT JOIN ACCOUNT_JOURNAL t11 ON t1.CURRENCY_EXCHANGE_JOURNAL_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t1.PARTNER_ID = t21.ID  LEFT JOIN ACCOUNT_ACCOUNT t31 ON t1.PROPERTY_STOCK_ACCOUNT_INPUT_CATEG_ID = t31.ID  LEFT JOIN ACCOUNT_TAX t41 ON t1.ACCOUNT_PURCHASE_TAX_ID = t41.ID  LEFT JOIN ACCOUNT_INCOTERMS t51 ON t1.INCOTERM_ID = t51.ID  LEFT JOIN ACCOUNT_MOVE t61 ON t1.ACCOUNT_OPENING_MOVE_ID = t61.ID  LEFT JOIN ACCOUNT_ACCOUNT t71 ON t1.TRANSFER_ACCOUNT_ID = t71.ID  LEFT JOIN RES_CURRENCY t81 ON t1.CURRENCY_ID = t81.ID  LEFT JOIN RES_USERS t91 ON t1.WRITE_UID = t91.ID  LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID  LEFT JOIN ACCOUNT_CHART_TEMPLATE t111 ON t1.CHART_TEMPLATE_ID = t111.ID  LEFT JOIN ACCOUNT_TAX t121 ON t1.ACCOUNT_SALE_TAX_ID = t121.ID  LEFT JOIN RES_USERS t131 ON t1.CREATE_UID = t131.ID  LEFT JOIN RES_PARTNER t141 ON t131.PARTNER_ID = t141.ID  LEFT JOIN ACCOUNT_ACCOUNT t151 ON t1.PROPERTY_STOCK_ACCOUNT_OUTPUT_CATEG_ID = t151.ID  LEFT JOIN ACCOUNT_ACCOUNT t161 ON t1.PROPERTY_STOCK_VALUATION_ACCOUNT_ID = t161.ID  LEFT JOIN RES_COMPANY t171 ON t1.PARENT_ID = t171.ID  LEFT JOIN RES_PARTNER t181 ON t171.PARTNER_ID = t181.ID  LEFT JOIN ACCOUNT_JOURNAL t191 ON t1.TAX_CASH_BASIS_JOURNAL_ID = t191.ID  LEFT JOIN STOCK_LOCATION t201 ON t1.INTERNAL_TRANSIT_LOCATION_ID = t201.ID  LEFT JOIN RESOURCE_CALENDAR t211 ON t1.RESOURCE_CALENDAR_ID = t211.ID  
+					 WHERE 	( t1.PARENT_ID IS NULL )
+			]]>
+    </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
 		<![CDATA[ SELECT t1.ACCOUNT_BANK_RECONCILIATION_START, t1.ACCOUNT_DASHBOARD_ONBOARDING_STATE, t1.ACCOUNT_INVOICE_ONBOARDING_STATE, t1.ACCOUNT_NO, t1.ACCOUNT_ONBOARDING_INVOICE_LAYOUT_STATE, t1.ACCOUNT_ONBOARDING_SALE_TAX_STATE, t1.ACCOUNT_ONBOARDING_SAMPLE_INVOICE_STATE, t61.DATE AS ACCOUNT_OPENING_DATE, t61.JOURNAL_ID AS ACCOUNT_OPENING_JOURNAL_ID, t1.ACCOUNT_OPENING_MOVE_ID, t61.NAME AS ACCOUNT_OPENING_MOVE_ID_TEXT, t1.ACCOUNT_PURCHASE_TAX_ID, t41.NAME AS ACCOUNT_PURCHASE_TAX_ID_TEXT, t1.ACCOUNT_SALE_TAX_ID, t121.NAME AS ACCOUNT_SALE_TAX_ID_TEXT, t1.ACCOUNT_SETUP_BANK_DATA_STATE, t1.ACCOUNT_SETUP_COA_STATE, t1.ACCOUNT_SETUP_FY_DATA_STATE, t1.ANGLO_SAXON_ACCOUNTING, t1.BANK_ACCOUNT_CODE_PREFIX, t1.BASE_ONBOARDING_COMPANY_STATE, t1.CASH_ACCOUNT_CODE_PREFIX, t1.CHART_TEMPLATE_ID, t111.NAME AS CHART_TEMPLATE_ID_TEXT, t1.COMPANY_REGISTRY, t1.CREATE_DATE, t1.CREATE_UID, t141.NAME AS CREATE_UID_TEXT, t1.CURRENCY_EXCHANGE_JOURNAL_ID, t11.NAME AS CURRENCY_EXCHANGE_JOURNAL_ID_TEXT, t1.CURRENCY_ID, t81.NAME AS CURRENCY_ID_TEXT, t21.EMAIL, t1.EXPECTS_CHART_OF_ACCOUNTS, t11.DEFAULT_DEBIT_ACCOUNT_ID AS EXPENSE_CURRENCY_EXCHANGE_ACCOUNT_ID, t1.EXTERNAL_REPORT_LAYOUT_ID, t1.FISCALYEAR_LAST_DAY, t1.FISCALYEAR_LAST_MONTH, t1.FISCALYEAR_LOCK_DATE, t1.ID, t11.DEFAULT_CREDIT_ACCOUNT_ID AS INCOME_CURRENCY_EXCHANGE_ACCOUNT_ID, t1.INCOTERM_ID, t51.NAME AS INCOTERM_ID_TEXT, t1.INTERNAL_TRANSIT_LOCATION_ID, t201.NAME AS INTERNAL_TRANSIT_LOCATION_ID_TEXT, t1.INVOICE_IS_EMAIL, t1.INVOICE_IS_PRINT, t1.INVOICE_IS_SNAILMAIL, t1.MANUFACTURING_LEAD, t21.NAME, t1.NOMENCLATURE_ID, t1.PAPERFORMAT_ID, t1.PARENT_ID, t181.NAME AS PARENT_ID_TEXT, t21.PARTNER_GID, t1.PARTNER_ID, t1.PAYMENT_ACQUIRER_ONBOARDING_STATE, t1.PAYMENT_ONBOARDING_PAYMENT_METHOD, t1.PERIOD_LOCK_DATE, t21.PHONE, t1.PORTAL_CONFIRMATION_PAY, t1.PORTAL_CONFIRMATION_SIGN, t1.PO_DOUBLE_VALIDATION, t1.PO_DOUBLE_VALIDATION_AMOUNT, t1.PO_LEAD, t1.PO_LOCK, t1.PROPERTY_STOCK_ACCOUNT_INPUT_CATEG_ID, t31.NAME AS PROPERTY_STOCK_ACCOUNT_INPUT_CATEG_ID_TEXT, t1.PROPERTY_STOCK_ACCOUNT_OUTPUT_CATEG_ID, t151.NAME AS PROPERTY_STOCK_ACCOUNT_OUTPUT_CATEG_ID_TEXT, t1.PROPERTY_STOCK_VALUATION_ACCOUNT_ID, t161.NAME AS PROPERTY_STOCK_VALUATION_ACCOUNT_ID_TEXT, t1.QR_CODE, t1.QUOTATION_VALIDITY_DAYS, t1.REPORT_FOOTER, t1.REPORT_HEADER, t1.RESOURCE_CALENDAR_ID, t211.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.SALE_ONBOARDING_ORDER_CONFIRMATION_STATE, t1.SALE_ONBOARDING_PAYMENT_METHOD, t1.SALE_ONBOARDING_SAMPLE_QUOTATION_STATE, t1.SALE_QUOTATION_ONBOARDING_STATE, t1.SECURITY_LEAD, t1.SEQUENCE, t1.SNAILMAIL_COLOR, t1.SNAILMAIL_DUPLEX, t1.SOCIAL_FACEBOOK, t1.SOCIAL_GITHUB, t1.SOCIAL_INSTAGRAM, t1.SOCIAL_LINKEDIN, t1.SOCIAL_TWITTER, t1.SOCIAL_YOUTUBE, t1.TAX_CALCULATION_ROUNDING_METHOD, t1.TAX_CASH_BASIS_JOURNAL_ID, t191.NAME AS TAX_CASH_BASIS_JOURNAL_ID_TEXT, t1.TAX_EXIGIBILITY, t1.TRANSFER_ACCOUNT_CODE_PREFIX, t1.TRANSFER_ACCOUNT_ID, t71.NAME AS TRANSFER_ACCOUNT_ID_TEXT, t21.VAT, t21.WEBSITE, t1.WEBSITE_SALE_ONBOARDING_PAYMENT_ACQUIRER_STATE, t1.WRITE_DATE, t1.WRITE_UID, t101.NAME AS WRITE_UID_TEXT FROM RES_COMPANY t1  LEFT JOIN ACCOUNT_JOURNAL t11 ON t1.CURRENCY_EXCHANGE_JOURNAL_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t1.PARTNER_ID = t21.ID  LEFT JOIN ACCOUNT_ACCOUNT t31 ON t1.PROPERTY_STOCK_ACCOUNT_INPUT_CATEG_ID = t31.ID  LEFT JOIN ACCOUNT_TAX t41 ON t1.ACCOUNT_PURCHASE_TAX_ID = t41.ID  LEFT JOIN ACCOUNT_INCOTERMS t51 ON t1.INCOTERM_ID = t51.ID  LEFT JOIN ACCOUNT_MOVE t61 ON t1.ACCOUNT_OPENING_MOVE_ID = t61.ID  LEFT JOIN ACCOUNT_ACCOUNT t71 ON t1.TRANSFER_ACCOUNT_ID = t71.ID  LEFT JOIN RES_CURRENCY t81 ON t1.CURRENCY_ID = t81.ID  LEFT JOIN RES_USERS t91 ON t1.WRITE_UID = t91.ID  LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID  LEFT JOIN ACCOUNT_CHART_TEMPLATE t111 ON t1.CHART_TEMPLATE_ID = t111.ID  LEFT JOIN ACCOUNT_TAX t121 ON t1.ACCOUNT_SALE_TAX_ID = t121.ID  LEFT JOIN RES_USERS t131 ON t1.CREATE_UID = t131.ID  LEFT JOIN RES_PARTNER t141 ON t131.PARTNER_ID = t141.ID  LEFT JOIN ACCOUNT_ACCOUNT t151 ON t1.PROPERTY_STOCK_ACCOUNT_OUTPUT_CATEG_ID = t151.ID  LEFT JOIN ACCOUNT_ACCOUNT t161 ON t1.PROPERTY_STOCK_VALUATION_ACCOUNT_ID = t161.ID  LEFT JOIN RES_COMPANY t171 ON t1.PARENT_ID = t171.ID  LEFT JOIN RES_PARTNER t181 ON t171.PARTNER_ID = t181.ID  LEFT JOIN ACCOUNT_JOURNAL t191 ON t1.TAX_CASH_BASIS_JOURNAL_ID = t191.ID  LEFT JOIN STOCK_LOCATION t201 ON t1.INTERNAL_TRANSIT_LOCATION_ID = t201.ID  LEFT JOIN RESOURCE_CALENDAR t211 ON t1.RESOURCE_CALENDAR_ID = t211.ID  

businesscentral-core/src/main/resources/mapper/odoo_hr/hr_department/Hr_departmentMapper.xml

@@ -110,11 +110,26 @@
          <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
      </select>
 
+    <!--数据集合[ROOT]-->
+	 <select id="searchROOT"  parameterType="cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_departmentSearchContext"  resultMap="Hr_departmentResultMap">
+         select t1.* from (
+                <include refid="ROOT" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
 		<![CDATA[ SELECT t1.ACTIVE, t1.COLOR, t1.COMPANY_ID, t91.NAME AS COMPANY_ID_TEXT, t1.COMPLETE_NAME, t1.CREATE_DATE, t1.CREATE_UID, t61.NAME AS CREATE_UID_TEXT, t1.ID, t1.MANAGER_ID, t41.NAME AS MANAGER_ID_TEXT, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.NAME, t1.PARENT_ID, t71.NAME AS PARENT_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UID_TEXT FROM HR_DEPARTMENT t1  LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN HR_EMPLOYEE t31 ON t1.MANAGER_ID = t31.ID  LEFT JOIN RESOURCE_RESOURCE t41 ON t31.RESOURCE_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.CREATE_UID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN HR_DEPARTMENT t71 ON t1.PARENT_ID = t71.ID  LEFT JOIN RES_COMPANY t81 ON t1.COMPANY_ID = t81.ID  LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID  
 			]]>
     </sql>
+    <!--数据查询[ROOT]-->
+    <sql id="ROOT" databaseId="postgresql">
+		<![CDATA[ SELECT t1.ACTIVE, t1.COLOR, t1.COMPANY_ID, t91.NAME AS COMPANY_ID_TEXT, t1.COMPLETE_NAME, t1.CREATE_DATE, t1.CREATE_UID, t61.NAME AS CREATE_UID_TEXT, t1.ID, t1.MANAGER_ID, t41.NAME AS MANAGER_ID_TEXT, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.NAME, t1.PARENT_ID, t71.NAME AS PARENT_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UID_TEXT FROM HR_DEPARTMENT t1  LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN HR_EMPLOYEE t31 ON t1.MANAGER_ID = t31.ID  LEFT JOIN RESOURCE_RESOURCE t41 ON t31.RESOURCE_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.CREATE_UID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN HR_DEPARTMENT t71 ON t1.PARENT_ID = t71.ID  LEFT JOIN RES_COMPANY t81 ON t1.COMPANY_ID = t81.ID  LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID  
+					 WHERE 	( t1.PARENT_ID IS NULL )
+			]]>
+    </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
 		<![CDATA[ SELECT t1.ACTIVE, t1.COLOR, t1.COMPANY_ID, t91.NAME AS COMPANY_ID_TEXT, t1.COMPLETE_NAME, t1.CREATE_DATE, t1.CREATE_UID, t61.NAME AS CREATE_UID_TEXT, t1.ID, t1.MANAGER_ID, t41.NAME AS MANAGER_ID_TEXT, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.NAME, t1.NOTE, t1.PARENT_ID, t71.NAME AS PARENT_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UID_TEXT FROM HR_DEPARTMENT t1  LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN HR_EMPLOYEE t31 ON t1.MANAGER_ID = t31.ID  LEFT JOIN RESOURCE_RESOURCE t41 ON t31.RESOURCE_ID = t41.ID  LEFT JOIN RES_USERS t51 ON t1.CREATE_UID = t51.ID  LEFT JOIN RES_PARTNER t61 ON t51.PARTNER_ID = t61.ID  LEFT JOIN HR_DEPARTMENT t71 ON t1.PARENT_ID = t71.ID  LEFT JOIN RES_COMPANY t81 ON t1.COMPANY_ID = t81.ID  LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID  

businesscentral-core/src/main/resources/mapper/odoo_hr/hr_employee_skill/Hr_employee_skillMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper	namespace="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_employee_skillMapper">
+
+    <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
+	<select id="selectById"  resultMap="Hr_employee_skillResultMap" databaseId="postgresql">
+        <![CDATA[select t1.* from (SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.EMPLOYEE_ID, t21.NAME AS EMPLOYEE_NAME, t1.ID, t1.SKILL_ID, t1.SKILL_LEVEL_ID, t51.NAME AS SKILL_LEVEL_NAME, t41.NAME AS SKILL_NAME, t1.SKILL_TYPE_ID, t31.NAME AS SKILL_TYPE_NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_EMPLOYEE_SKILL t1  LEFT JOIN HR_EMPLOYEE t11 ON t1.EMPLOYEE_ID = t11.ID  LEFT JOIN RESOURCE_RESOURCE t21 ON t11.RESOURCE_ID = t21.ID  LEFT JOIN HR_SKILL_TYPE t31 ON t1.SKILL_TYPE_ID = t31.ID  LEFT JOIN HR_SKILL t41 ON t1.SKILL_ID = t41.ID  LEFT JOIN HR_SKILL_LEVEL t51 ON t1.SKILL_LEVEL_ID = t51.ID  ) t1 where id=#{id}]]>
+    </select>
+
+    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
+    <resultMap id="Hr_employee_skillResultMap" type="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_employee_skill" autoMapping="true">
+		<id property="id" column="id" /><!--主键字段映射-->
+		<result property="employeeId" column="employee_id" />
+		<result property="employeeName" column="employee_name" />
+		<result property="skillTypeId" column="skill_type_id" />
+		<result property="skillId" column="skill_id" />
+		<result property="skillLevelId" column="skill_level_id" />
+		<result property="skillTypeName" column="skill_type_name" />
+		<result property="skillName" column="skill_name" />
+		<result property="skillLevelName" column="skill_level_name" />
+		<result property="createDate" column="create_date" />
+		<result property="writeDate" column="write_date" />
+		<result property="createUid" column="create_uid" />
+		<result property="writeUid" column="write_uid" />
+            
+		
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooEmployee" javaType="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_employee" column="employee_id" select="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_employeeMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooSkillLevel" javaType="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_level" column="skill_level_id" select="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_skill_levelMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooSkill" javaType="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill" column="skill_id" select="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_skillMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooSkillType" javaType="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type" column="skill_type_id" select="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_skill_typeMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooCreate" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="create_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooWrite" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="write_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
+    </resultMap>
+
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_EMPLOYEE_SKILL_HR_EMPLOYEE_EMPLOYEE_ID] -->
+	 <select id="selectByEmployeeId" resultMap="Hr_employee_skillResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  employee_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_LEVEL_SKILL_LEVEL_ID] -->
+	 <select id="selectBySkillLevelId" resultMap="Hr_employee_skillResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  skill_level_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_SKILL_ID] -->
+	 <select id="selectBySkillId" resultMap="Hr_employee_skillResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  skill_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID] -->
+	 <select id="selectBySkillTypeId" resultMap="Hr_employee_skillResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  skill_type_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_EMPLOYEE_SKILL_RES_USERS_CREATE_UID] -->
+	 <select id="selectByCreateUid" resultMap="Hr_employee_skillResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  create_uid=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_EMPLOYEE_SKILL_RES_USERS_WRITE_UID] -->
+	 <select id="selectByWriteUid" resultMap="Hr_employee_skillResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  write_uid=#{id}
+     </select>
+
+    <!--数据集合[Default]-->
+	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_employee_skillSearchContext"  resultMap="Hr_employee_skillResultMap">
+         select t1.* from (
+                <include refid="Default" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="postgresql">
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.EMPLOYEE_ID, t21.NAME AS EMPLOYEE_NAME, t1.ID, t1.SKILL_ID, t1.SKILL_LEVEL_ID, t51.NAME AS SKILL_LEVEL_NAME, t41.NAME AS SKILL_NAME, t1.SKILL_TYPE_ID, t31.NAME AS SKILL_TYPE_NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_EMPLOYEE_SKILL t1  LEFT JOIN HR_EMPLOYEE t11 ON t1.EMPLOYEE_ID = t11.ID  LEFT JOIN RESOURCE_RESOURCE t21 ON t11.RESOURCE_ID = t21.ID  LEFT JOIN HR_SKILL_TYPE t31 ON t1.SKILL_TYPE_ID = t31.ID  LEFT JOIN HR_SKILL t41 ON t1.SKILL_ID = t41.ID  LEFT JOIN HR_SKILL_LEVEL t51 ON t1.SKILL_LEVEL_ID = t51.ID  
+			]]>
+    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="postgresql">
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.EMPLOYEE_ID, t21.NAME AS EMPLOYEE_NAME, t1.ID, t1.SKILL_ID, t1.SKILL_LEVEL_ID, t51.NAME AS SKILL_LEVEL_NAME, t41.NAME AS SKILL_NAME, t1.SKILL_TYPE_ID, t31.NAME AS SKILL_TYPE_NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_EMPLOYEE_SKILL t1  LEFT JOIN HR_EMPLOYEE t11 ON t1.EMPLOYEE_ID = t11.ID  LEFT JOIN RESOURCE_RESOURCE t21 ON t11.RESOURCE_ID = t21.ID  LEFT JOIN HR_SKILL_TYPE t31 ON t1.SKILL_TYPE_ID = t31.ID  LEFT JOIN HR_SKILL t41 ON t1.SKILL_ID = t41.ID  LEFT JOIN HR_SKILL_LEVEL t51 ON t1.SKILL_LEVEL_ID = t51.ID  
+			]]>
+    </sql>
+    
+</mapper>
+

businesscentral-core/src/main/resources/mapper/odoo_hr/hr_resume_line/Hr_resume_lineMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="Hr_resume_lineResultMap" databaseId="postgresql">
-        <![CDATA[select t1.* from (SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.DATE_END, t1.DATE_START, t1.DISPLAY_TYPE, t1.EMPLOYEE_ID, t21.NAME AS EMPLOYEE_ID_TEXT, t1.ID, t1.LINE_TYPE_ID, t31.NAME AS LINE_TYPE_ID_TEXT, t1.NAME, t1.WRITE_DATE FROM HR_RESUME_LINE t1  LEFT JOIN HR_EMPLOYEE t11 ON t1.EMPLOYEE_ID = t11.ID  LEFT JOIN RESOURCE_RESOURCE t21 ON t11.RESOURCE_ID = t21.ID  LEFT JOIN HR_RESUME_LINE_TYPE t31 ON t1.LINE_TYPE_ID = t31.ID  ) t1 where id=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.DATE_END, t1.DATE_START, t1.DISPLAY_TYPE, t1.EMPLOYEE_ID, t21.NAME AS EMPLOYEE_ID_TEXT, t1.ID, t1.LINE_TYPE_ID, t31.NAME AS LINE_TYPE_ID_TEXT, t1.NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_RESUME_LINE t1  LEFT JOIN HR_EMPLOYEE t11 ON t1.EMPLOYEE_ID = t11.ID  LEFT JOIN RESOURCE_RESOURCE t21 ON t11.RESOURCE_ID = t21.ID  LEFT JOIN HR_RESUME_LINE_TYPE t31 ON t1.LINE_TYPE_ID = t31.ID  ) t1 where id=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -21,6 +21,7 @@
 		<result property="createDate" column="create_date" />
 		<result property="writeDate" column="write_date" />
 		<result property="createUid" column="create_uid" />
+		<result property="writeUid" column="write_uid" />
             
 		
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
@@ -29,6 +30,8 @@
 		<association property="odooResumeLineType" javaType="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_resume_line_type" column="line_type_id" select="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_resume_line_typeMapper.selectById" fetchType="lazy"></association>
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
 		<association property="odooCreate" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="create_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooWrite" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="write_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
     </resultMap>
 
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_RESUME_LINE_HR_EMPLOYEE_EMPLOYEE_ID] -->
@@ -51,6 +54,13 @@
                 <include refid="Default" />
 			 ) t1
 			 where  create_uid=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_RESUME_LINE_RES_USERS_WRITE_UID] -->
+	 <select id="selectByWriteUid" resultMap="Hr_resume_lineResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  write_uid=#{id}
      </select>
 
     <!--数据集合[Default]-->
@@ -64,12 +74,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.DATE_END, t1.DATE_START, t1.DISPLAY_TYPE, t1.EMPLOYEE_ID, t21.NAME AS EMPLOYEE_ID_TEXT, t1.ID, t1.LINE_TYPE_ID, t31.NAME AS LINE_TYPE_ID_TEXT, t1.NAME, t1.WRITE_DATE FROM HR_RESUME_LINE t1  LEFT JOIN HR_EMPLOYEE t11 ON t1.EMPLOYEE_ID = t11.ID  LEFT JOIN RESOURCE_RESOURCE t21 ON t11.RESOURCE_ID = t21.ID  LEFT JOIN HR_RESUME_LINE_TYPE t31 ON t1.LINE_TYPE_ID = t31.ID  
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.DATE_END, t1.DATE_START, t1.DISPLAY_TYPE, t1.EMPLOYEE_ID, t21.NAME AS EMPLOYEE_ID_TEXT, t1.ID, t1.LINE_TYPE_ID, t31.NAME AS LINE_TYPE_ID_TEXT, t1.NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_RESUME_LINE t1  LEFT JOIN HR_EMPLOYEE t11 ON t1.EMPLOYEE_ID = t11.ID  LEFT JOIN RESOURCE_RESOURCE t21 ON t11.RESOURCE_ID = t21.ID  LEFT JOIN HR_RESUME_LINE_TYPE t31 ON t1.LINE_TYPE_ID = t31.ID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.DATE_END, t1.DATE_START, t1.DISPLAY_TYPE, t1.EMPLOYEE_ID, t21.NAME AS EMPLOYEE_ID_TEXT, t1.ID, t1.LINE_TYPE_ID, t31.NAME AS LINE_TYPE_ID_TEXT, t1.NAME, t1.WRITE_DATE FROM HR_RESUME_LINE t1  LEFT JOIN HR_EMPLOYEE t11 ON t1.EMPLOYEE_ID = t11.ID  LEFT JOIN RESOURCE_RESOURCE t21 ON t11.RESOURCE_ID = t21.ID  LEFT JOIN HR_RESUME_LINE_TYPE t31 ON t1.LINE_TYPE_ID = t31.ID  
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.DATE_END, t1.DATE_START, t1.DISPLAY_TYPE, t1.EMPLOYEE_ID, t21.NAME AS EMPLOYEE_ID_TEXT, t1.ID, t1.LINE_TYPE_ID, t31.NAME AS LINE_TYPE_ID_TEXT, t1.NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_RESUME_LINE t1  LEFT JOIN HR_EMPLOYEE t11 ON t1.EMPLOYEE_ID = t11.ID  LEFT JOIN RESOURCE_RESOURCE t21 ON t11.RESOURCE_ID = t21.ID  LEFT JOIN HR_RESUME_LINE_TYPE t31 ON t1.LINE_TYPE_ID = t31.ID  
 			]]>
     </sql>
     

businesscentral-core/src/main/resources/mapper/odoo_hr/hr_resume_line_type/Hr_resume_line_typeMapper.xml

@@ -5,16 +5,38 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="Hr_resume_line_typeResultMap" databaseId="postgresql">
-        <![CDATA[select t1.* from (SELECT t1.ID, t1.NAME, t1.SEQUENCE FROM HR_RESUME_LINE_TYPE t1  ) t1 where id=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.ID, t1.NAME, t1.SEQUENCE, t1.WRITE_DATE, t1.WRITE_UID FROM HR_RESUME_LINE_TYPE t1  ) t1 where id=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="Hr_resume_line_typeResultMap" type="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_resume_line_type" autoMapping="true">
 		<id property="id" column="id" /><!--主键字段映射-->
+		<result property="createDate" column="create_date" />
+		<result property="writeDate" column="write_date" />
+		<result property="writeUid" column="write_uid" />
+		<result property="createUid" column="create_uid" />
             
 		
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooCreate" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="create_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooWrite" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="write_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
     </resultMap>
 
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_RESUME_LINE_TYPE_RES_USERS_CREATE_UID] -->
+	 <select id="selectByCreateUid" resultMap="Hr_resume_line_typeResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  create_uid=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_RESUME_LINE_TYPE_RES_USERS_WRITE_UID] -->
+	 <select id="selectByWriteUid" resultMap="Hr_resume_line_typeResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  write_uid=#{id}
+     </select>
 
     <!--数据集合[Default]-->
 	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_resume_line_typeSearchContext"  resultMap="Hr_resume_line_typeResultMap">
@@ -27,12 +49,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-		<![CDATA[ SELECT t1.ID, t1.NAME, t1.SEQUENCE FROM HR_RESUME_LINE_TYPE t1  
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.ID, t1.NAME, t1.SEQUENCE, t1.WRITE_DATE, t1.WRITE_UID FROM HR_RESUME_LINE_TYPE t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-		<![CDATA[ SELECT t1.ID, t1.NAME, t1.SEQUENCE FROM HR_RESUME_LINE_TYPE t1  
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.ID, t1.NAME, t1.SEQUENCE, t1.WRITE_DATE, t1.WRITE_UID FROM HR_RESUME_LINE_TYPE t1  
 			]]>
     </sql>
     

businesscentral-core/src/main/resources/mapper/odoo_hr/hr_skill/Hr_skillMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper	namespace="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_skillMapper">
+
+    <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
+	<select id="selectById"  resultMap="Hr_skillResultMap" databaseId="postgresql">
+        <![CDATA[select t1.* from (SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.ID, t1.NAME, t1.SKILL_TYPE_ID, t11.NAME AS SKILL_TYPE_NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_SKILL t1  LEFT JOIN HR_SKILL_TYPE t11 ON t1.SKILL_TYPE_ID = t11.ID  ) t1 where id=#{id}]]>
+    </select>
+
+    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
+    <resultMap id="Hr_skillResultMap" type="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill" autoMapping="true">
+		<id property="id" column="id" /><!--主键字段映射-->
+		<result property="skillTypeId" column="skill_type_id" />
+		<result property="skillTypeName" column="skill_type_name" />
+		<result property="createDate" column="create_date" />
+		<result property="writeDate" column="write_date" />
+		<result property="createUid" column="create_uid" />
+		<result property="writeUid" column="write_uid" />
+            
+		
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooSkillType" javaType="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type" column="skill_type_id" select="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_skill_typeMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooCreate" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="create_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooWrite" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="write_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
+    </resultMap>
+
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID] -->
+	 <select id="selectBySkillTypeId" resultMap="Hr_skillResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  skill_type_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_SKILL_RES_USERS_CREATE_UID] -->
+	 <select id="selectByCreateUid" resultMap="Hr_skillResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  create_uid=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_SKILL_RES_USERS_WRITE_UID] -->
+	 <select id="selectByWriteUid" resultMap="Hr_skillResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  write_uid=#{id}
+     </select>
+
+    <!--数据集合[Default]-->
+	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skillSearchContext"  resultMap="Hr_skillResultMap">
+         select t1.* from (
+                <include refid="Default" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="postgresql">
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.ID, t1.NAME, t1.SKILL_TYPE_ID, t11.NAME AS SKILL_TYPE_NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_SKILL t1  LEFT JOIN HR_SKILL_TYPE t11 ON t1.SKILL_TYPE_ID = t11.ID  
+			]]>
+    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="postgresql">
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.ID, t1.NAME, t1.SKILL_TYPE_ID, t11.NAME AS SKILL_TYPE_NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_SKILL t1  LEFT JOIN HR_SKILL_TYPE t11 ON t1.SKILL_TYPE_ID = t11.ID  
+			]]>
+    </sql>
+    
+</mapper>
+

businesscentral-core/src/main/resources/mapper/odoo_hr/hr_skill_level/Hr_skill_levelMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper	namespace="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_skill_levelMapper">
+
+    <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
+	<select id="selectById"  resultMap="Hr_skill_levelResultMap" databaseId="postgresql">
+        <![CDATA[select t1.* from (SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.ID, t1.NAME, t1.SKILL_TYPE_ID, t11.NAME AS SKILL_TYPE_NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_SKILL_LEVEL t1  LEFT JOIN HR_SKILL_TYPE t11 ON t1.SKILL_TYPE_ID = t11.ID  ) t1 where id=#{id}]]>
+    </select>
+
+    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
+    <resultMap id="Hr_skill_levelResultMap" type="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_level" autoMapping="true">
+		<id property="id" column="id" /><!--主键字段映射-->
+		<result property="skillTypeId" column="skill_type_id" />
+		<result property="skillTypeName" column="skill_type_name" />
+		<result property="writeDate" column="write_date" />
+		<result property="createDate" column="create_date" />
+		<result property="writeUid" column="write_uid" />
+		<result property="createUid" column="create_uid" />
+            
+		
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooSkillType" javaType="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type" column="skill_type_id" select="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_skill_typeMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooCreate" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="create_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooWrite" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="write_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
+    </resultMap>
+
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_SKILL_LEVEL_HR_SKILL_TYPE_SKILL_TYPE_ID] -->
+	 <select id="selectBySkillTypeId" resultMap="Hr_skill_levelResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  skill_type_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_SKILL_LEVEL_RES_USERS_CREATE_UID] -->
+	 <select id="selectByCreateUid" resultMap="Hr_skill_levelResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  create_uid=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_SKILL_LEVEL_RES_USERS_WRITE_UID] -->
+	 <select id="selectByWriteUid" resultMap="Hr_skill_levelResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  write_uid=#{id}
+     </select>
+
+    <!--数据集合[Default]-->
+	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skill_levelSearchContext"  resultMap="Hr_skill_levelResultMap">
+         select t1.* from (
+                <include refid="Default" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="postgresql">
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.ID, t1.NAME, t1.SKILL_TYPE_ID, t11.NAME AS SKILL_TYPE_NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_SKILL_LEVEL t1  LEFT JOIN HR_SKILL_TYPE t11 ON t1.SKILL_TYPE_ID = t11.ID  
+			]]>
+    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="postgresql">
+		<![CDATA[ SELECT t1.CREATE_DATE, t1.CREATE_UID, t1.ID, t1.NAME, t1.SKILL_TYPE_ID, t11.NAME AS SKILL_TYPE_NAME, t1.WRITE_DATE, t1.WRITE_UID FROM HR_SKILL_LEVEL t1  LEFT JOIN HR_SKILL_TYPE t11 ON t1.SKILL_TYPE_ID = t11.ID  
+			]]>
+    </sql>
+    
+</mapper>
+

businesscentral-core/src/main/resources/mapper/odoo_hr/hr_skill_type/Hr_skill_typeMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper	namespace="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_skill_typeMapper">
+
+    <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
+	<select id="selectById"  resultMap="Hr_skill_typeResultMap" databaseId="postgresql">
+        <![CDATA[select t1.* from (SELECT t1.ID, t1.NAME FROM HR_SKILL_TYPE t1  ) t1 where id=#{id}]]>
+    </select>
+
+    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
+    <resultMap id="Hr_skill_typeResultMap" type="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type" autoMapping="true">
+		<id property="id" column="id" /><!--主键字段映射-->
+            
+		
+    </resultMap>
+
+
+    <!--数据集合[Default]-->
+	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skill_typeSearchContext"  resultMap="Hr_skill_typeResultMap">
+         select t1.* from (
+                <include refid="Default" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="postgresql">
+		<![CDATA[ SELECT t1.ID, t1.NAME FROM HR_SKILL_TYPE t1  
+			]]>
+    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="postgresql">
+		<![CDATA[ SELECT t1.ID, t1.NAME FROM HR_SKILL_TYPE t1  
+			]]>
+    </sql>
+    
+</mapper>
+

businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json

@@ -65413,6 +65413,12 @@
      "entity_name":"HR_DEPARTMENT",
      "ref_entity_name":"HR_EMPLOYEE"
     },
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_HR_EMPLOYEE_EMPLOYEE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_employee",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"HR_EMPLOYEE"
+    },
     {"name":"DER1N_HR_EMPLOYEE__HR_EMPLOYEE__COACH_ID",
      "relation_type":"DER1N",
      "code_name":"Odoo_coach",
@@ -65840,6 +65846,274 @@
      "ref_entity_name":"RES_USERS"
     }
     ]
+ }
+    ,
+    {
+    "entity_name":"HR_EMPLOYEE_SKILL",
+    "logic_name":"员工技能",
+    "code_name":"Hr_employee_skill",
+    "table_name":"HR_EMPLOYEE_SKILL",
+    "system_id":"iBizBusinessCentral",
+    "system_name":"iBiz商业中心",
+    "fields":[
+    {
+    "fieldname":"ID" ,
+    "codename":"Id",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_employee_skill",
+    "field_type":"ACID",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "data_length":20,
+    "key_field":1,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"EMPLOYEE_ID" ,
+    "codename":"Employee_id",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_employee_skill",
+    "ref_de":"HR_EMPLOYEE",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_EMPLOYEE_SKILL_HR_EMPLOYEE_EMPLOYEE_ID",
+    "relation_codename":"Odoo_employee",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"EMPLOYEE_NAME" ,
+    "codename":"Employee_name",
+    "field_logic_name":"员工",
+    "entity_name":"Hr_employee_skill",
+    "ref_de":"HR_EMPLOYEE",
+    "ref_field_name":"NAME",
+    "relation_name":"DER1N_HR_EMPLOYEE_SKILL_HR_EMPLOYEE_EMPLOYEE_ID",
+    "relation_codename":"Odoo_employee",
+    "field_type":"PICKUPTEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":1
+    },
+    {
+    "fieldname":"SKILL_TYPE_ID" ,
+    "codename":"Skill_type_id",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_employee_skill",
+    "ref_de":"HR_SKILL_TYPE",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+    "relation_codename":"Odoo_skill_type",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "data_length":20,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"SKILL_ID" ,
+    "codename":"Skill_id",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_employee_skill",
+    "ref_de":"HR_SKILL",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_SKILL_ID",
+    "relation_codename":"Odoo_skill",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "data_length":20,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"SKILL_LEVEL_ID" ,
+    "codename":"Skill_level_id",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_employee_skill",
+    "ref_de":"HR_SKILL_LEVEL",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_LEVEL_SKILL_LEVEL_ID",
+    "relation_codename":"Odoo_skill_level",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "data_length":20,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"SKILL_TYPE_NAME" ,
+    "codename":"Skill_type_name",
+    "field_logic_name":"技能类型",
+    "entity_name":"Hr_employee_skill",
+    "ref_de":"HR_SKILL_TYPE",
+    "ref_field_name":"NAME",
+    "relation_name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+    "relation_codename":"Odoo_skill_type",
+    "field_type":"PICKUPTEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"SKILL_NAME" ,
+    "codename":"Skill_name",
+    "field_logic_name":"技能",
+    "entity_name":"Hr_employee_skill",
+    "ref_de":"HR_SKILL",
+    "ref_field_name":"NAME",
+    "relation_name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_SKILL_ID",
+    "relation_codename":"Odoo_skill",
+    "field_type":"PICKUPTEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"SKILL_LEVEL_NAME" ,
+    "codename":"Skill_level_name",
+    "field_logic_name":"技能等级",
+    "entity_name":"Hr_employee_skill",
+    "ref_de":"HR_SKILL_LEVEL",
+    "ref_field_name":"NAME",
+    "relation_name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_LEVEL_SKILL_LEVEL_ID",
+    "relation_codename":"Odoo_skill_level",
+    "field_type":"PICKUPTEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"CREATE_DATE" ,
+    "codename":"Create_date",
+    "field_logic_name":"创建时间",
+    "entity_name":"Hr_employee_skill",
+    "field_type":"DATETIME",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"DATETIME",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"WRITE_DATE" ,
+    "codename":"Write_date",
+    "field_logic_name":"最后更新时间",
+    "entity_name":"Hr_employee_skill",
+    "field_type":"DATETIME",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"DATETIME",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"CREATE_UID" ,
+    "codename":"Create_uid",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_employee_skill",
+    "ref_de":"RES_USERS",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_EMPLOYEE_SKILL_RES_USERS_CREATE_UID",
+    "relation_codename":"Odoo_create",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"WRITE_UID" ,
+    "codename":"Write_uid",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_employee_skill",
+    "ref_de":"RES_USERS",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_EMPLOYEE_SKILL_RES_USERS_WRITE_UID",
+    "relation_codename":"Odoo_write",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    }
+    ],
+    "subEntitys":[
+    ],
+    "parentEntitys":[
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_HR_EMPLOYEE_EMPLOYEE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_employee",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"HR_EMPLOYEE"
+    },
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_LEVEL_SKILL_LEVEL_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_skill_level",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"HR_SKILL_LEVEL"
+    },
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_SKILL_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_skill",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"HR_SKILL"
+    },
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_skill_type",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"HR_SKILL_TYPE"
+    },
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_RES_USERS_CREATE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_create",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_RES_USERS_WRITE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_write",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"RES_USERS"
+    }
+    ]
  }
     ,
     {
@@ -74303,6 +74577,23 @@
     "key_field":0,
     "show_order":1000,
     "major_field":0
+    },
+    {
+    "fieldname":"WRITE_UID" ,
+    "codename":"Write_uid",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_resume_line",
+    "ref_de":"RES_USERS",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_RESUME_LINE_RES_USERS_WRITE_UID",
+    "relation_codename":"Odoo_write",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
     }
     ],
     "subEntitys":[
@@ -74325,6 +74616,12 @@
      "code_name":"Odoo_create",
      "entity_name":"HR_RESUME_LINE",
      "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_RESUME_LINE_RES_USERS_WRITE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_write",
+     "entity_name":"HR_RESUME_LINE",
+     "ref_entity_name":"RES_USERS"
     }
     ]
  }
@@ -74377,6 +74674,66 @@
     "key_field":0,
     "show_order":1000,
     "major_field":0
+    },
+    {
+    "fieldname":"CREATE_DATE" ,
+    "codename":"Create_date",
+    "field_logic_name":"创建时间",
+    "entity_name":"Hr_resume_line_type",
+    "field_type":"DATETIME",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"DATETIME",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"WRITE_DATE" ,
+    "codename":"Write_date",
+    "field_logic_name":"最后更新时间",
+    "entity_name":"Hr_resume_line_type",
+    "field_type":"DATETIME",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"DATETIME",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"WRITE_UID" ,
+    "codename":"Write_uid",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_resume_line_type",
+    "ref_de":"RES_USERS",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_RESUME_LINE_TYPE_RES_USERS_WRITE_UID",
+    "relation_codename":"Odoo_write",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"CREATE_UID" ,
+    "codename":"Create_uid",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_resume_line_type",
+    "ref_de":"RES_USERS",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_RESUME_LINE_TYPE_RES_USERS_CREATE_UID",
+    "relation_codename":"Odoo_create",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
     }
     ],
     "subEntitys":[
@@ -74388,6 +74745,405 @@
     }
     ],
     "parentEntitys":[
+    {"name":"DER1N_HR_RESUME_LINE_TYPE_RES_USERS_CREATE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_create",
+     "entity_name":"HR_RESUME_LINE_TYPE",
+     "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_RESUME_LINE_TYPE_RES_USERS_WRITE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_write",
+     "entity_name":"HR_RESUME_LINE_TYPE",
+     "ref_entity_name":"RES_USERS"
+    }
+    ]
+ }
+    ,
+    {
+    "entity_name":"HR_SKILL",
+    "logic_name":"技能",
+    "code_name":"Hr_skill",
+    "table_name":"HR_SKILL",
+    "system_id":"iBizBusinessCentral",
+    "system_name":"iBiz商业中心",
+    "fields":[
+    {
+    "fieldname":"SKILL_TYPE_ID" ,
+    "codename":"Skill_type_id",
+    "field_logic_name":"技能类型",
+    "entity_name":"Hr_skill",
+    "ref_de":"HR_SKILL_TYPE",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+    "relation_codename":"Odoo_skill_type",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "data_length":20,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"ID" ,
+    "codename":"Id",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_skill",
+    "field_type":"ACID",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "data_length":20,
+    "key_field":1,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"NAME" ,
+    "codename":"Name",
+    "field_logic_name":"名称",
+    "entity_name":"Hr_skill",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":1
+    },
+    {
+    "fieldname":"SKILL_TYPE_NAME" ,
+    "codename":"Skill_type_name",
+    "field_logic_name":"类型",
+    "entity_name":"Hr_skill",
+    "ref_de":"HR_SKILL_TYPE",
+    "ref_field_name":"NAME",
+    "relation_name":"DER1N_HR_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+    "relation_codename":"Odoo_skill_type",
+    "field_type":"PICKUPTEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"CREATE_DATE" ,
+    "codename":"Create_date",
+    "field_logic_name":"创建时间",
+    "entity_name":"Hr_skill",
+    "field_type":"DATETIME",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"DATETIME",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"WRITE_DATE" ,
+    "codename":"Write_date",
+    "field_logic_name":"最后更新时间",
+    "entity_name":"Hr_skill",
+    "field_type":"DATETIME",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"DATETIME",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"CREATE_UID" ,
+    "codename":"Create_uid",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_skill",
+    "ref_de":"RES_USERS",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_SKILL_RES_USERS_CREATE_UID",
+    "relation_codename":"Odoo_create",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"WRITE_UID" ,
+    "codename":"Write_uid",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_skill",
+    "ref_de":"RES_USERS",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_SKILL_RES_USERS_WRITE_UID",
+    "relation_codename":"Odoo_write",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    }
+    ],
+    "subEntitys":[
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_SKILL_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_skill",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"HR_SKILL"
+    }
+    ],
+    "parentEntitys":[
+    {"name":"DER1N_HR_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_skill_type",
+     "entity_name":"HR_SKILL",
+     "ref_entity_name":"HR_SKILL_TYPE"
+    },
+    {"name":"DER1N_HR_SKILL_RES_USERS_CREATE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_create",
+     "entity_name":"HR_SKILL",
+     "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_SKILL_RES_USERS_WRITE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_write",
+     "entity_name":"HR_SKILL",
+     "ref_entity_name":"RES_USERS"
+    }
+    ]
+ }
+    ,
+    {
+    "entity_name":"HR_SKILL_LEVEL",
+    "logic_name":"技能等级",
+    "code_name":"Hr_skill_level",
+    "table_name":"HR_SKILL_LEVEL",
+    "system_id":"iBizBusinessCentral",
+    "system_name":"iBiz商业中心",
+    "fields":[
+    {
+    "fieldname":"ID" ,
+    "codename":"Id",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_skill_level",
+    "field_type":"ACID",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "data_length":20,
+    "key_field":1,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"NAME" ,
+    "codename":"Name",
+    "field_logic_name":"名称",
+    "entity_name":"Hr_skill_level",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":1
+    },
+    {
+    "fieldname":"SKILL_TYPE_ID" ,
+    "codename":"Skill_type_id",
+    "field_logic_name":"技能类型",
+    "entity_name":"Hr_skill_level",
+    "ref_de":"HR_SKILL_TYPE",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_SKILL_LEVEL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+    "relation_codename":"Odoo_skill_type",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "data_length":20,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"SKILL_TYPE_NAME" ,
+    "codename":"Skill_type_name",
+    "field_logic_name":"技能类型",
+    "entity_name":"Hr_skill_level",
+    "ref_de":"HR_SKILL_TYPE",
+    "ref_field_name":"NAME",
+    "relation_name":"DER1N_HR_SKILL_LEVEL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+    "relation_codename":"Odoo_skill_type",
+    "field_type":"PICKUPTEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"WRITE_DATE" ,
+    "codename":"Write_date",
+    "field_logic_name":"最后更新时间",
+    "entity_name":"Hr_skill_level",
+    "field_type":"DATETIME",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"DATETIME",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"CREATE_DATE" ,
+    "codename":"Create_date",
+    "field_logic_name":"创建时间",
+    "entity_name":"Hr_skill_level",
+    "field_type":"DATETIME",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"DATETIME",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"WRITE_UID" ,
+    "codename":"Write_uid",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_skill_level",
+    "ref_de":"RES_USERS",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_SKILL_LEVEL_RES_USERS_WRITE_UID",
+    "relation_codename":"Odoo_write",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"CREATE_UID" ,
+    "codename":"Create_uid",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_skill_level",
+    "ref_de":"RES_USERS",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_SKILL_LEVEL_RES_USERS_CREATE_UID",
+    "relation_codename":"Odoo_create",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    }
+    ],
+    "subEntitys":[
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_LEVEL_SKILL_LEVEL_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_skill_level",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"HR_SKILL_LEVEL"
+    }
+    ],
+    "parentEntitys":[
+    {"name":"DER1N_HR_SKILL_LEVEL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_skill_type",
+     "entity_name":"HR_SKILL_LEVEL",
+     "ref_entity_name":"HR_SKILL_TYPE"
+    },
+    {"name":"DER1N_HR_SKILL_LEVEL_RES_USERS_CREATE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_create",
+     "entity_name":"HR_SKILL_LEVEL",
+     "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_SKILL_LEVEL_RES_USERS_WRITE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_write",
+     "entity_name":"HR_SKILL_LEVEL",
+     "ref_entity_name":"RES_USERS"
+    }
+    ]
+ }
+    ,
+    {
+    "entity_name":"HR_SKILL_TYPE",
+    "logic_name":"技能类型",
+    "code_name":"Hr_skill_type",
+    "table_name":"HR_SKILL_TYPE",
+    "system_id":"iBizBusinessCentral",
+    "system_name":"iBiz商业中心",
+    "fields":[
+    {
+    "fieldname":"ID" ,
+    "codename":"Id",
+    "field_logic_name":"ID",
+    "entity_name":"Hr_skill_type",
+    "field_type":"ACID",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "data_length":20,
+    "key_field":1,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"NAME" ,
+    "codename":"Name",
+    "field_logic_name":"名称",
+    "entity_name":"Hr_skill_type",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":1
+    }
+    ],
+    "subEntitys":[
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_skill_type",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"HR_SKILL_TYPE"
+    },
+    {"name":"DER1N_HR_SKILL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_skill_type",
+     "entity_name":"HR_SKILL",
+     "ref_entity_name":"HR_SKILL_TYPE"
+    },
+    {"name":"DER1N_HR_SKILL_LEVEL_HR_SKILL_TYPE_SKILL_TYPE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_skill_type",
+     "entity_name":"HR_SKILL_LEVEL",
+     "ref_entity_name":"HR_SKILL_TYPE"
+    }
+    ],
+    "parentEntitys":[
     ]
  }
     ,
@@ -151901,7 +152657,7 @@
     "relation_codename":"Odoo_purchase_payment_term",
     "field_type":"PICKUP",
     "nullable":1,
-    "physical_field":1,
+    "physical_field":0,
     "data_type":"BIGINT",
     "key_field":0,
     "show_order":1000,
@@ -156910,6 +157666,18 @@
      "entity_name":"HR_EMPLOYEE_CATEGORY",
      "ref_entity_name":"RES_USERS"
     },
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_RES_USERS_CREATE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_create",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_EMPLOYEE_SKILL_RES_USERS_WRITE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_write",
+     "entity_name":"HR_EMPLOYEE_SKILL",
+     "ref_entity_name":"RES_USERS"
+    },
     {"name":"DER1N_HR_EMPLOYEE__RES_USERS__CREATE_UID",
      "relation_type":"DER1N",
      "code_name":"Odoo_create",
@@ -157120,6 +157888,48 @@
      "entity_name":"HR_RESUME_LINE",
      "ref_entity_name":"RES_USERS"
     },
+    {"name":"DER1N_HR_RESUME_LINE_RES_USERS_WRITE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_write",
+     "entity_name":"HR_RESUME_LINE",
+     "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_RESUME_LINE_TYPE_RES_USERS_CREATE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_create",
+     "entity_name":"HR_RESUME_LINE_TYPE",
+     "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_RESUME_LINE_TYPE_RES_USERS_WRITE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_write",
+     "entity_name":"HR_RESUME_LINE_TYPE",
+     "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_SKILL_LEVEL_RES_USERS_CREATE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_create",
+     "entity_name":"HR_SKILL_LEVEL",
+     "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_SKILL_LEVEL_RES_USERS_WRITE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_write",
+     "entity_name":"HR_SKILL_LEVEL",
+     "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_SKILL_RES_USERS_CREATE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_create",
+     "entity_name":"HR_SKILL",
+     "ref_entity_name":"RES_USERS"
+    },
+    {"name":"DER1N_HR_SKILL_RES_USERS_WRITE_UID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_write",
+     "entity_name":"HR_SKILL",
+     "ref_entity_name":"RES_USERS"
+    },
     {"name":"DER1N_IAP_ACCOUNT__RES_USERS__CREATE_UID",
      "relation_type":"DER1N",
      "code_name":"Odoo_create",

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Res_supplierDTO.java

@@ -209,14 +209,6 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
         this.modify("category_id",categoryId);
     }
 
-    /**
-     * 设置 [PROPERTY_SUPPLIER_PAYMENT_TERM_ID]
-     */
-    public void setPropertySupplierPaymentTermId(Long  propertySupplierPaymentTermId){
-        this.propertySupplierPaymentTermId = propertySupplierPaymentTermId ;
-        this.modify("property_supplier_payment_term_id",propertySupplierPaymentTermId);
-    }
-
 
 }
 

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/rest/Hr_departmentResource.java

@@ -158,6 +158,28 @@ public class Hr_departmentResource {
                 .body(new PageImpl(hr_departmentMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_department-searchROOT-all') and hasPermission(#context,'iBizBusinessCentral-Hr_department-Get')")
+	@ApiOperation(value = "获取根节点部门查询", tags = {"HR 部门" } ,notes = "获取根节点部门查询")
+    @RequestMapping(method= RequestMethod.GET , value="/hr_departments/fetchroot")
+	public ResponseEntity<List<Hr_departmentDTO>> fetchROOT(Hr_departmentSearchContext context) {
+        Page<Hr_department> domains = hr_departmentService.searchROOT(context) ;
+        List<Hr_departmentDTO> list = hr_departmentMapping.toDto(domains.getContent());
+        return ResponseEntity.status(HttpStatus.OK)
+                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
+                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
+                .header("x-total", String.valueOf(domains.getTotalElements()))
+                .body(list);
+	}
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_department-searchROOT-all') and hasPermission(#context,'iBizBusinessCentral-Hr_department-Get')")
+	@ApiOperation(value = "查询根节点部门查询", tags = {"HR 部门" } ,notes = "查询根节点部门查询")
+    @RequestMapping(method= RequestMethod.POST , value="/hr_departments/searchroot")
+	public ResponseEntity<Page<Hr_departmentDTO>> searchROOT(@RequestBody Hr_departmentSearchContext context) {
+        Page<Hr_department> domains = hr_departmentService.searchROOT(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(hr_departmentMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
+
 
 }
 

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/rest/Res_companyResource.java

@@ -158,6 +158,28 @@ public class Res_companyResource {
                 .body(new PageImpl(res_companyMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_company-searchROOT-all') and hasPermission(#context,'iBizBusinessCentral-Res_company-Get')")
+	@ApiOperation(value = "获取根节点查询", tags = {"公司" } ,notes = "获取根节点查询")
+    @RequestMapping(method= RequestMethod.GET , value="/res_companies/fetchroot")
+	public ResponseEntity<List<Res_companyDTO>> fetchROOT(Res_companySearchContext context) {
+        Page<Res_company> domains = res_companyService.searchROOT(context) ;
+        List<Res_companyDTO> list = res_companyMapping.toDto(domains.getContent());
+        return ResponseEntity.status(HttpStatus.OK)
+                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
+                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
+                .header("x-total", String.valueOf(domains.getTotalElements()))
+                .body(list);
+	}
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_company-searchROOT-all') and hasPermission(#context,'iBizBusinessCentral-Res_company-Get')")
+	@ApiOperation(value = "查询根节点查询", tags = {"公司" } ,notes = "查询根节点查询")
+    @RequestMapping(method= RequestMethod.POST , value="/res_companies/searchroot")
+	public ResponseEntity<Page<Res_companyDTO>> searchROOT(@RequestBody Res_companySearchContext context) {
+        Page<Res_company> domains = res_companyService.searchROOT(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(res_companyMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
+
 
 }