xignzi006 发布系统代码 [Spring Boot]

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

@@ -137,6 +137,65 @@ public class Res_supplier extends EntityMP implements Serializable {
     @JSONField(name = "property_supplier_payment_term_name")
     @JsonProperty("property_supplier_payment_term_name")
     private String propertySupplierPaymentTermName;
+    /**
+     * 称谓
+     */
+    @TableField(exist = false)
+    @JSONField(name = "title_text")
+    @JsonProperty("title_text")
+    private String titleText;
+    /**
+     * ID
+     */
+    @TableField(value = "title")
+    @JSONField(name = "title")
+    @JsonProperty("title")
+    private Long title;
+    /**
+     * ID
+     */
+    @DEField(name = "company_id")
+    @TableField(value = "company_id")
+    @JSONField(name = "company_id")
+    @JsonProperty("company_id")
+    private Long companyId;
+    /**
+     * 公司
+     */
+    @TableField(exist = false)
+    @JSONField(name = "company_id_text")
+    @JsonProperty("company_id_text")
+    private String companyIdText;
+    /**
+     * ID
+     */
+    @DEField(name = "country_id")
+    @TableField(value = "country_id")
+    @JSONField(name = "country_id")
+    @JsonProperty("country_id")
+    private Long countryId;
+    /**
+     * 国家/地区
+     */
+    @TableField(exist = false)
+    @JSONField(name = "country_id_text")
+    @JsonProperty("country_id_text")
+    private String countryIdText;
+    /**
+     * 州/省
+     */
+    @TableField(exist = false)
+    @JSONField(name = "state_id_text")
+    @JsonProperty("state_id_text")
+    private String stateIdText;
+    /**
+     * ID
+     */
+    @DEField(name = "state_id")
+    @TableField(value = "state_id")
+    @JSONField(name = "state_id")
+    @JsonProperty("state_id")
+    private Long stateId;
 
     /**
      * 
@@ -146,6 +205,38 @@ public class Res_supplier extends EntityMP implements Serializable {
     @TableField(exist = false)
     private cn.ibizlab.businesscentral.core.odoo_account.domain.Account_payment_term odooPurchasePaymentTerm;
 
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_company odooCompany;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_country odooCountry;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_country_state odooState;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner_title odooTitle;
+
 
 
     /**
@@ -212,6 +303,38 @@ public class Res_supplier extends EntityMP implements Serializable {
         this.modify("category_id",categoryId);
     }
     
+    /**
+     * 设置 [ID]
+     */
+    public void setTitle(Long title){
+        this.title = title ;
+        this.modify("title",title);
+    }
+
+    /**
+     * 设置 [ID]
+     */
+    public void setCompanyId(Long companyId){
+        this.companyId = companyId ;
+        this.modify("company_id",companyId);
+    }
+
+    /**
+     * 设置 [ID]
+     */
+    public void setCountryId(Long countryId){
+        this.countryId = countryId ;
+        this.modify("country_id",countryId);
+    }
+
+    /**
+     * 设置 [ID]
+     */
+    public void setStateId(Long stateId){
+        this.stateId = stateId ;
+        this.modify("state_id",stateId);
+    }
+
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/filter/Res_supplierSearchContext.java

@@ -69,6 +69,90 @@ public class Res_supplierSearchContext extends QueryWrapperContext<Res_supplier>
             this.getSearchCond().like("property_supplier_payment_term_name", n_property_supplier_payment_term_name_like);
         }
     }
+	private String n_title_text_eq;//[称谓]
+	public void setN_title_text_eq(String n_title_text_eq) {
+        this.n_title_text_eq = n_title_text_eq;
+        if(!ObjectUtils.isEmpty(this.n_title_text_eq)){
+            this.getSearchCond().eq("title_text", n_title_text_eq);
+        }
+    }
+	private String n_title_text_like;//[称谓]
+	public void setN_title_text_like(String n_title_text_like) {
+        this.n_title_text_like = n_title_text_like;
+        if(!ObjectUtils.isEmpty(this.n_title_text_like)){
+            this.getSearchCond().like("title_text", n_title_text_like);
+        }
+    }
+	private Long n_title_eq;//[ID]
+	public void setN_title_eq(Long n_title_eq) {
+        this.n_title_eq = n_title_eq;
+        if(!ObjectUtils.isEmpty(this.n_title_eq)){
+            this.getSearchCond().eq("title", n_title_eq);
+        }
+    }
+	private Long n_company_id_eq;//[ID]
+	public void setN_company_id_eq(Long n_company_id_eq) {
+        this.n_company_id_eq = n_company_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_company_id_eq)){
+            this.getSearchCond().eq("company_id", n_company_id_eq);
+        }
+    }
+	private String n_company_id_text_eq;//[公司]
+	public void setN_company_id_text_eq(String n_company_id_text_eq) {
+        this.n_company_id_text_eq = n_company_id_text_eq;
+        if(!ObjectUtils.isEmpty(this.n_company_id_text_eq)){
+            this.getSearchCond().eq("company_id_text", n_company_id_text_eq);
+        }
+    }
+	private String n_company_id_text_like;//[公司]
+	public void setN_company_id_text_like(String n_company_id_text_like) {
+        this.n_company_id_text_like = n_company_id_text_like;
+        if(!ObjectUtils.isEmpty(this.n_company_id_text_like)){
+            this.getSearchCond().like("company_id_text", n_company_id_text_like);
+        }
+    }
+	private Long n_country_id_eq;//[ID]
+	public void setN_country_id_eq(Long n_country_id_eq) {
+        this.n_country_id_eq = n_country_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_country_id_eq)){
+            this.getSearchCond().eq("country_id", n_country_id_eq);
+        }
+    }
+	private String n_country_id_text_eq;//[国家/地区]
+	public void setN_country_id_text_eq(String n_country_id_text_eq) {
+        this.n_country_id_text_eq = n_country_id_text_eq;
+        if(!ObjectUtils.isEmpty(this.n_country_id_text_eq)){
+            this.getSearchCond().eq("country_id_text", n_country_id_text_eq);
+        }
+    }
+	private String n_country_id_text_like;//[国家/地区]
+	public void setN_country_id_text_like(String n_country_id_text_like) {
+        this.n_country_id_text_like = n_country_id_text_like;
+        if(!ObjectUtils.isEmpty(this.n_country_id_text_like)){
+            this.getSearchCond().like("country_id_text", n_country_id_text_like);
+        }
+    }
+	private String n_state_id_text_eq;//[州/省]
+	public void setN_state_id_text_eq(String n_state_id_text_eq) {
+        this.n_state_id_text_eq = n_state_id_text_eq;
+        if(!ObjectUtils.isEmpty(this.n_state_id_text_eq)){
+            this.getSearchCond().eq("state_id_text", n_state_id_text_eq);
+        }
+    }
+	private String n_state_id_text_like;//[州/省]
+	public void setN_state_id_text_like(String n_state_id_text_like) {
+        this.n_state_id_text_like = n_state_id_text_like;
+        if(!ObjectUtils.isEmpty(this.n_state_id_text_like)){
+            this.getSearchCond().like("state_id_text", n_state_id_text_like);
+        }
+    }
+	private Long n_state_id_eq;//[ID]
+	public void setN_state_id_eq(Long n_state_id_eq) {
+        this.n_state_id_eq = n_state_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_state_id_eq)){
+            this.getSearchCond().eq("state_id", n_state_id_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

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

@@ -64,6 +64,14 @@ public interface Res_supplierMapper extends BaseMapper<Res_supplier>{
 
     List<Res_supplier> selectByPropertySupplierPaymentTermId(@Param("id") Serializable id) ;
 
+    List<Res_supplier> selectByCompanyId(@Param("id") Serializable id) ;
+
+    List<Res_supplier> selectByCountryId(@Param("id") Serializable id) ;
+
+    List<Res_supplier> selectByStateId(@Param("id") Serializable id) ;
+
+    List<Res_supplier> selectByTitle(@Param("id") Serializable id) ;
+
 
         
     boolean saveRelByCategoryId(@Param("partner_id") Long partner_id, List<cn.ibizlab.businesscentral.util.domain.MultiSelectItem> res_partner_categories);

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

@@ -40,6 +40,14 @@ public interface IRes_supplierService extends IService<Res_supplier>{
     Page<Res_supplier> searchDefault(Res_supplierSearchContext context) ;
     List<Res_supplier> selectByPropertySupplierPaymentTermId(Long id);
     void removeByPropertySupplierPaymentTermId(Long id);
+    List<Res_supplier> selectByCompanyId(Long id);
+    void removeByCompanyId(Long id);
+    List<Res_supplier> selectByCountryId(Long id);
+    void removeByCountryId(Long id);
+    List<Res_supplier> selectByStateId(Long id);
+    void removeByStateId(Long id);
+    List<Res_supplier> selectByTitle(Long id);
+    void removeByTitle(Long id);
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

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

@@ -298,6 +298,9 @@ public class Res_companyServiceImpl extends EBSServiceImpl<Res_companyMapper, Re
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partnerService resPartnerService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
     @Autowired
     @Lazy

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

@@ -92,6 +92,9 @@ public class Res_countryServiceImpl extends EBSServiceImpl<Res_countryMapper, Re
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partnerService resPartnerService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_sale.service.ISale_reportService saleReportService;
     @Autowired
     @Lazy

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

@@ -62,6 +62,9 @@ public class Res_country_stateServiceImpl extends EBSServiceImpl<Res_country_sta
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partnerService resPartnerService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_countryService resCountryService;
     @Autowired
     @Lazy

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

@@ -62,6 +62,9 @@ public class Res_partner_titleServiceImpl extends EBSServiceImpl<Res_partner_tit
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partnerService resPartnerService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_supplierService resSupplierService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
 
     protected int batchSize = 500;

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

@@ -66,6 +66,18 @@ public class Res_supplierServiceImpl extends EBSServiceImpl<Res_supplierMapper,
     @Autowired
     @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_account.service.IAccount_payment_termService accountPaymentTermService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_companyService resCompanyService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_countryService resCountryService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_country_stateService resCountryStateService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partner_titleService resPartnerTitleService;
 
     protected int batchSize = 500;
 
@@ -236,6 +248,42 @@ public class Res_supplierServiceImpl extends EBSServiceImpl<Res_supplierMapper,
         this.remove(new QueryWrapper<Res_supplier>().eq("property_supplier_payment_term_id",id));
     }
 
+	@Override
+    public List<Res_supplier> selectByCompanyId(Long id) {
+        return baseMapper.selectByCompanyId(id);
+    }
+    @Override
+    public void removeByCompanyId(Long id) {
+        this.remove(new QueryWrapper<Res_supplier>().eq("company_id",id));
+    }
+
+	@Override
+    public List<Res_supplier> selectByCountryId(Long id) {
+        return baseMapper.selectByCountryId(id);
+    }
+    @Override
+    public void removeByCountryId(Long id) {
+        this.remove(new QueryWrapper<Res_supplier>().eq("country_id",id));
+    }
+
+	@Override
+    public List<Res_supplier> selectByStateId(Long id) {
+        return baseMapper.selectByStateId(id);
+    }
+    @Override
+    public void removeByStateId(Long id) {
+        this.remove(new QueryWrapper<Res_supplier>().eq("state_id",id));
+    }
+
+	@Override
+    public List<Res_supplier> selectByTitle(Long id) {
+        return baseMapper.selectByTitle(id);
+    }
+    @Override
+    public void removeByTitle(Long id) {
+        this.remove(new QueryWrapper<Res_supplier>().eq("title",id));
+    }
+
 
     /**
      * 查询集合 数据集
@@ -263,6 +311,46 @@ public class Res_supplierServiceImpl extends EBSServiceImpl<Res_supplierMapper,
             }
             et.setPropertySupplierPaymentTermName(odooPurchasePaymentTerm.getName());
         }
+        //实体关系[DER1N_RES_SUPPLIER_RES_COMPANY_COMPANY_ID]
+        if(!ObjectUtils.isEmpty(et.getCompanyId())){
+            cn.ibizlab.businesscentral.core.odoo_base.domain.Res_company odooCompany=et.getOdooCompany();
+            if(ObjectUtils.isEmpty(odooCompany)){
+                cn.ibizlab.businesscentral.core.odoo_base.domain.Res_company majorEntity=resCompanyService.get(et.getCompanyId());
+                et.setOdooCompany(majorEntity);
+                odooCompany=majorEntity;
+            }
+            et.setCompanyIdText(odooCompany.getName());
+        }
+        //实体关系[DER1N_RES_SUPPLIER_RES_COUNTRY_COUNTRY_ID]
+        if(!ObjectUtils.isEmpty(et.getCountryId())){
+            cn.ibizlab.businesscentral.core.odoo_base.domain.Res_country odooCountry=et.getOdooCountry();
+            if(ObjectUtils.isEmpty(odooCountry)){
+                cn.ibizlab.businesscentral.core.odoo_base.domain.Res_country majorEntity=resCountryService.get(et.getCountryId());
+                et.setOdooCountry(majorEntity);
+                odooCountry=majorEntity;
+            }
+            et.setCountryIdText(odooCountry.getName());
+        }
+        //实体关系[DER1N_RES_SUPPLIER_RES_COUNTRY_STATE_STATE_ID]
+        if(!ObjectUtils.isEmpty(et.getStateId())){
+            cn.ibizlab.businesscentral.core.odoo_base.domain.Res_country_state odooState=et.getOdooState();
+            if(ObjectUtils.isEmpty(odooState)){
+                cn.ibizlab.businesscentral.core.odoo_base.domain.Res_country_state majorEntity=resCountryStateService.get(et.getStateId());
+                et.setOdooState(majorEntity);
+                odooState=majorEntity;
+            }
+            et.setStateIdText(odooState.getName());
+        }
+        //实体关系[DER1N_RES_SUPPLIER_RES_PARTNER_TITLE_TITLE]
+        if(!ObjectUtils.isEmpty(et.getTitle())){
+            cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner_title odooTitle=et.getOdooTitle();
+            if(ObjectUtils.isEmpty(odooTitle)){
+                cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner_title majorEntity=resPartnerTitleService.get(et.getTitle());
+                et.setOdooTitle(majorEntity);
+                odooTitle=majorEntity;
+            }
+            et.setTitleText(odooTitle.getName());
+        }
     }
 
 

businesscentral-core/src/main/resources/mapper/odoo_base/res_supplier/Res_supplierMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="Res_supplierResultMap" databaseId="postgresql">
-        <![CDATA[select t1.* from (SELECT (SELECT ARRAY_TO_JSON(ARRAY_AGG(T.*))  FROM (SELECT M2.ID AS SRFKEY, M2.NAME AS SRFMAJORTEXT FROM RES_PARTNER_RES_PARTNER_CATEGORY_REL M1  LEFT JOIN RES_PARTNER_CATEGORY M2 ON M1.CATEGORY_ID = M2.ID  WHERE M1.PARTNER_ID =T1.ID ) T) AS CATEGORY_ID, t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1  ) t1 where id=#{id}]]>
+        <![CDATA[select t1.* from (SELECT (SELECT ARRAY_TO_JSON(ARRAY_AGG(T.*))  FROM (SELECT M2.ID AS SRFKEY, M2.NAME AS SRFMAJORTEXT FROM RES_PARTNER_RES_PARTNER_CATEGORY_REL M1  LEFT JOIN RES_PARTNER_CATEGORY M2 ON M1.CATEGORY_ID = M2.ID  WHERE M1.PARTNER_ID =T1.ID ) T) AS CATEGORY_ID, t1.COMPANY_ID, t31.NAME AS COMPANY_ID_TEXT, t1.COUNTRY_ID, t41.NAME AS COUNTRY_ID_TEXT, t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.STATE_ID, t51.NAME AS STATE_ID_TEXT, t1.TITLE, t11.NAME AS TITLE_TEXT, t1.TYPE, t1.VAT FROM RES_PARTNER t1  LEFT JOIN RES_PARTNER_TITLE t11 ON t1.TITLE = t11.ID  LEFT JOIN RES_COMPANY t21 ON t1.COMPANY_ID = t21.ID  LEFT JOIN RES_PARTNER t31 ON t21.PARTNER_ID = t31.ID  LEFT JOIN RES_COUNTRY t41 ON t1.COUNTRY_ID = t41.ID  LEFT JOIN RES_COUNTRY_STATE t51 ON t1.STATE_ID = t51.ID  ) t1 where id=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -16,10 +16,26 @@
 		<result property="categoryId" column="category_id" />
 		<result property="propertySupplierPaymentTermId" column="property_supplier_payment_term_id" />
 		<result property="propertySupplierPaymentTermName" column="property_supplier_payment_term_name" />
+		<result property="titleText" column="title_text" />
+		<result property="title" column="title" />
+		<result property="companyId" column="company_id" />
+		<result property="companyIdText" column="company_id_text" />
+		<result property="countryId" column="country_id" />
+		<result property="countryIdText" column="country_id_text" />
+		<result property="stateIdText" column="state_id_text" />
+		<result property="stateId" column="state_id" />
             
 		
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
 		<association property="odooPurchasePaymentTerm" javaType="cn.ibizlab.businesscentral.core.odoo_account.domain.Account_payment_term" column="property_supplier_payment_term_id" select="cn.ibizlab.businesscentral.core.odoo_account.mapper.Account_payment_termMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooCompany" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_company" column="company_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_companyMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooCountry" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_country" column="country_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_countryMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooState" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_country_state" column="state_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_country_stateMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooTitle" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner_title" column="title" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_partner_titleMapper.selectById" fetchType="lazy"></association>
     </resultMap>
 
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_SUPPLIER_ACCOUNT_PAYMENT_TERM_PROPERTY_SUPPLIER_PAYMENT_TERM_ID] -->
@@ -28,6 +44,34 @@
                 <include refid="Default" />
 			 ) t1
 			 where  property_supplier_payment_term_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_SUPPLIER_RES_COMPANY_COMPANY_ID] -->
+	 <select id="selectByCompanyId" resultMap="Res_supplierResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  company_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_SUPPLIER_RES_COUNTRY_COUNTRY_ID] -->
+	 <select id="selectByCountryId" resultMap="Res_supplierResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  country_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_SUPPLIER_RES_COUNTRY_STATE_STATE_ID] -->
+	 <select id="selectByStateId" resultMap="Res_supplierResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  state_id=#{id}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_SUPPLIER_RES_PARTNER_TITLE_TITLE] -->
+	 <select id="selectByTitle" resultMap="Res_supplierResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  title=#{id}
      </select>
 
     <!--数据集合[Default]-->
@@ -41,12 +85,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-		<![CDATA[ SELECT t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1  
+		<![CDATA[ SELECT t1.COMPANY_ID, t31.NAME AS COMPANY_ID_TEXT, t1.COUNTRY_ID, t41.NAME AS COUNTRY_ID_TEXT, t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.STATE_ID, t51.NAME AS STATE_ID_TEXT, t1.TITLE, t11.NAME AS TITLE_TEXT, t1.TYPE, t1.VAT FROM RES_PARTNER t1  LEFT JOIN RES_PARTNER_TITLE t11 ON t1.TITLE = t11.ID  LEFT JOIN RES_COMPANY t21 ON t1.COMPANY_ID = t21.ID  LEFT JOIN RES_PARTNER t31 ON t21.PARTNER_ID = t31.ID  LEFT JOIN RES_COUNTRY t41 ON t1.COUNTRY_ID = t41.ID  LEFT JOIN RES_COUNTRY_STATE t51 ON t1.STATE_ID = t51.ID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-		<![CDATA[ SELECT (SELECT ARRAY_TO_JSON(ARRAY_AGG(T.*))  FROM (SELECT M2.ID AS SRFKEY, M2.NAME AS SRFMAJORTEXT FROM RES_PARTNER_RES_PARTNER_CATEGORY_REL M1  LEFT JOIN RES_PARTNER_CATEGORY M2 ON M1.CATEGORY_ID = M2.ID  WHERE M1.PARTNER_ID =T1.ID ) T) AS CATEGORY_ID, t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1  
+		<![CDATA[ SELECT (SELECT ARRAY_TO_JSON(ARRAY_AGG(T.*))  FROM (SELECT M2.ID AS SRFKEY, M2.NAME AS SRFMAJORTEXT FROM RES_PARTNER_RES_PARTNER_CATEGORY_REL M1  LEFT JOIN RES_PARTNER_CATEGORY M2 ON M1.CATEGORY_ID = M2.ID  WHERE M1.PARTNER_ID =T1.ID ) T) AS CATEGORY_ID, t1.COMPANY_ID, t31.NAME AS COMPANY_ID_TEXT, t1.COUNTRY_ID, t41.NAME AS COUNTRY_ID_TEXT, t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.STATE_ID, t51.NAME AS STATE_ID_TEXT, t1.TITLE, t11.NAME AS TITLE_TEXT, t1.TYPE, t1.VAT FROM RES_PARTNER t1  LEFT JOIN RES_PARTNER_TITLE t11 ON t1.TITLE = t11.ID  LEFT JOIN RES_COMPANY t21 ON t1.COMPANY_ID = t21.ID  LEFT JOIN RES_PARTNER t31 ON t21.PARTNER_ID = t31.ID  LEFT JOIN RES_COUNTRY t41 ON t1.COUNTRY_ID = t41.ID  LEFT JOIN RES_COUNTRY_STATE t51 ON t1.STATE_ID = t51.ID  
 			]]>
     </sql>
     

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

@@ -141327,6 +141327,12 @@
      "entity_name":"RES_PARTNER",
      "ref_entity_name":"RES_COMPANY"
     },
+    {"name":"DER1N_RES_SUPPLIER_RES_COMPANY_COMPANY_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_company",
+     "entity_name":"RES_SUPPLIER",
+     "ref_entity_name":"RES_COMPANY"
+    },
     {"name":"DER1N_RES_USERS__RES_COMPANY__COMPANY_ID",
      "relation_type":"DER1N",
      "code_name":"Odoo_company",
@@ -145952,6 +145958,12 @@
      "entity_name":"RES_PARTNER",
      "ref_entity_name":"RES_COUNTRY"
     },
+    {"name":"DER1N_RES_SUPPLIER_RES_COUNTRY_COUNTRY_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_country",
+     "entity_name":"RES_SUPPLIER",
+     "ref_entity_name":"RES_COUNTRY"
+    },
     {"name":"DER1N_SALE_REPORT__RES_COUNTRY__COUNTRY_ID",
      "relation_type":"DER1N",
      "code_name":"Odoo_country",
@@ -146432,6 +146444,12 @@
      "code_name":"Odoo_state",
      "entity_name":"RES_PARTNER",
      "ref_entity_name":"RES_COUNTRY_STATE"
+    },
+    {"name":"DER1N_RES_SUPPLIER_RES_COUNTRY_STATE_STATE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_state",
+     "entity_name":"RES_SUPPLIER",
+     "ref_entity_name":"RES_COUNTRY_STATE"
     }
     ],
     "parentEntitys":[
@@ -152535,6 +152553,12 @@
      "code_name":"Odoo_title",
      "entity_name":"RES_PARTNER",
      "ref_entity_name":"RES_PARTNER_TITLE"
+    },
+    {"name":"DER1N_RES_SUPPLIER_RES_PARTNER_TITLE_TITLE",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_title",
+     "entity_name":"RES_SUPPLIER",
+     "ref_entity_name":"RES_PARTNER_TITLE"
     }
     ],
     "parentEntitys":[
@@ -152752,6 +152776,146 @@
     "key_field":0,
     "show_order":1000,
     "major_field":0
+    },
+    {
+    "fieldname":"TITLE_TEXT" ,
+    "codename":"Title_text",
+    "field_logic_name":"称谓",
+    "entity_name":"Res_supplier",
+    "ref_de":"RES_PARTNER_TITLE",
+    "ref_field_name":"NAME",
+    "relation_name":"DER1N_RES_SUPPLIER_RES_PARTNER_TITLE_TITLE",
+    "relation_codename":"Odoo_title",
+    "field_type":"PICKUPTEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"TITLE" ,
+    "codename":"Title",
+    "field_logic_name":"ID",
+    "entity_name":"Res_supplier",
+    "ref_de":"RES_PARTNER_TITLE",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_RES_SUPPLIER_RES_PARTNER_TITLE_TITLE",
+    "relation_codename":"Odoo_title",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"COMPANY_ID" ,
+    "codename":"Company_id",
+    "field_logic_name":"ID",
+    "entity_name":"Res_supplier",
+    "ref_de":"RES_COMPANY",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_RES_SUPPLIER_RES_COMPANY_COMPANY_ID",
+    "relation_codename":"Odoo_company",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"COMPANY_ID_TEXT" ,
+    "codename":"Company_id_text",
+    "field_logic_name":"公司",
+    "entity_name":"Res_supplier",
+    "ref_de":"RES_COMPANY",
+    "ref_field_name":"NAME",
+    "relation_name":"DER1N_RES_SUPPLIER_RES_COMPANY_COMPANY_ID",
+    "relation_codename":"Odoo_company",
+    "field_type":"PICKUPTEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"COUNTRY_ID" ,
+    "codename":"Country_id",
+    "field_logic_name":"ID",
+    "entity_name":"Res_supplier",
+    "ref_de":"RES_COUNTRY",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_RES_SUPPLIER_RES_COUNTRY_COUNTRY_ID",
+    "relation_codename":"Odoo_country",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"COUNTRY_ID_TEXT" ,
+    "codename":"Country_id_text",
+    "field_logic_name":"国家/地区",
+    "entity_name":"Res_supplier",
+    "ref_de":"RES_COUNTRY",
+    "ref_field_name":"NAME",
+    "relation_name":"DER1N_RES_SUPPLIER_RES_COUNTRY_COUNTRY_ID",
+    "relation_codename":"Odoo_country",
+    "field_type":"PICKUPTEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"STATE_ID_TEXT" ,
+    "codename":"State_id_text",
+    "field_logic_name":"州/省",
+    "entity_name":"Res_supplier",
+    "ref_de":"RES_COUNTRY_STATE",
+    "ref_field_name":"NAME",
+    "relation_name":"DER1N_RES_SUPPLIER_RES_COUNTRY_STATE_STATE_ID",
+    "relation_codename":"Odoo_state",
+    "field_type":"PICKUPTEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"STATE_ID" ,
+    "codename":"State_id",
+    "field_logic_name":"ID",
+    "entity_name":"Res_supplier",
+    "ref_de":"RES_COUNTRY_STATE",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_RES_SUPPLIER_RES_COUNTRY_STATE_STATE_ID",
+    "relation_codename":"Odoo_state",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
     }
     ],
     "subEntitys":[
@@ -152786,6 +152950,30 @@
      "code_name":"Odoo_purchase_payment_term",
      "entity_name":"RES_SUPPLIER",
      "ref_entity_name":"ACCOUNT_PAYMENT_TERM"
+    },
+    {"name":"DER1N_RES_SUPPLIER_RES_COMPANY_COMPANY_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_company",
+     "entity_name":"RES_SUPPLIER",
+     "ref_entity_name":"RES_COMPANY"
+    },
+    {"name":"DER1N_RES_SUPPLIER_RES_COUNTRY_COUNTRY_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_country",
+     "entity_name":"RES_SUPPLIER",
+     "ref_entity_name":"RES_COUNTRY"
+    },
+    {"name":"DER1N_RES_SUPPLIER_RES_COUNTRY_STATE_STATE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_state",
+     "entity_name":"RES_SUPPLIER",
+     "ref_entity_name":"RES_COUNTRY_STATE"
+    },
+    {"name":"DER1N_RES_SUPPLIER_RES_PARTNER_TITLE_TITLE",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_title",
+     "entity_name":"RES_SUPPLIER",
+     "ref_entity_name":"RES_PARTNER_TITLE"
     }
     ]
  }

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

+package cn.ibizlab.businesscentral.core.dto;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.alibaba.fastjson.annotation.JSONField;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import cn.ibizlab.businesscentral.util.domain.DTOBase;
+import cn.ibizlab.businesscentral.util.domain.DTOClient;
+import lombok.Data;
+
+/**
+ * 服务DTO对象[Hr_employee_skillDTO]
+ */
+@Data
+public class Hr_employee_skillDTO extends DTOBase implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性 [ID]
+     *
+     */
+    @JSONField(name = "id")
+    @JsonProperty("id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 属性 [EMPLOYEE_ID]
+     *
+     */
+    @JSONField(name = "employee_id")
+    @JsonProperty("employee_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long employeeId;
+
+    /**
+     * 属性 [EMPLOYEE_NAME]
+     *
+     */
+    @JSONField(name = "employee_name")
+    @JsonProperty("employee_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String employeeName;
+
+    /**
+     * 属性 [SKILL_TYPE_ID]
+     *
+     */
+    @JSONField(name = "skill_type_id")
+    @JsonProperty("skill_type_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long skillTypeId;
+
+    /**
+     * 属性 [SKILL_ID]
+     *
+     */
+    @JSONField(name = "skill_id")
+    @JsonProperty("skill_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long skillId;
+
+    /**
+     * 属性 [SKILL_LEVEL_ID]
+     *
+     */
+    @JSONField(name = "skill_level_id")
+    @JsonProperty("skill_level_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long skillLevelId;
+
+    /**
+     * 属性 [SKILL_TYPE_NAME]
+     *
+     */
+    @JSONField(name = "skill_type_name")
+    @JsonProperty("skill_type_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String skillTypeName;
+
+    /**
+     * 属性 [SKILL_NAME]
+     *
+     */
+    @JSONField(name = "skill_name")
+    @JsonProperty("skill_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String skillName;
+
+    /**
+     * 属性 [SKILL_LEVEL_NAME]
+     *
+     */
+    @JSONField(name = "skill_level_name")
+    @JsonProperty("skill_level_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String skillLevelName;
+
+    /**
+     * 属性 [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;
+
+    /**
+     * 属性 [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;
+
+    /**
+     * 属性 [CREATE_UID]
+     *
+     */
+    @JSONField(name = "create_uid")
+    @JsonProperty("create_uid")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long createUid;
+
+    /**
+     * 属性 [WRITE_UID]
+     *
+     */
+    @JSONField(name = "write_uid")
+    @JsonProperty("write_uid")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long writeUid;
+
+
+    /**
+     * 设置 [EMPLOYEE_ID]
+     */
+    public void setEmployeeId(Long  employeeId){
+        this.employeeId = employeeId ;
+        this.modify("employee_id",employeeId);
+    }
+
+    /**
+     * 设置 [SKILL_TYPE_ID]
+     */
+    public void setSkillTypeId(Long  skillTypeId){
+        this.skillTypeId = skillTypeId ;
+        this.modify("skill_type_id",skillTypeId);
+    }
+
+    /**
+     * 设置 [SKILL_ID]
+     */
+    public void setSkillId(Long  skillId){
+        this.skillId = skillId ;
+        this.modify("skill_id",skillId);
+    }
+
+    /**
+     * 设置 [SKILL_LEVEL_ID]
+     */
+    public void setSkillLevelId(Long  skillLevelId){
+        this.skillLevelId = skillLevelId ;
+        this.modify("skill_level_id",skillLevelId);
+    }
+
+    /**
+     * 设置 [CREATE_DATE]
+     */
+    public void setCreateDate(Timestamp  createDate){
+        this.createDate = createDate ;
+        this.modify("create_date",createDate);
+    }
+
+    /**
+     * 设置 [WRITE_DATE]
+     */
+    public void setWriteDate(Timestamp  writeDate){
+        this.writeDate = writeDate ;
+        this.modify("write_date",writeDate);
+    }
+
+    /**
+     * 设置 [CREATE_UID]
+     */
+    public void setCreateUid(Long  createUid){
+        this.createUid = createUid ;
+        this.modify("create_uid",createUid);
+    }
+
+    /**
+     * 设置 [WRITE_UID]
+     */
+    public void setWriteUid(Long  writeUid){
+        this.writeUid = writeUid ;
+        this.modify("write_uid",writeUid);
+    }
+
+
+}
+
+

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

+package cn.ibizlab.businesscentral.core.dto;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.alibaba.fastjson.annotation.JSONField;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import cn.ibizlab.businesscentral.util.domain.DTOBase;
+import cn.ibizlab.businesscentral.util.domain.DTOClient;
+import lombok.Data;
+
+/**
+ * 服务DTO对象[Hr_skillDTO]
+ */
+@Data
+public class Hr_skillDTO extends DTOBase implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性 [SKILL_TYPE_ID]
+     *
+     */
+    @JSONField(name = "skill_type_id")
+    @JsonProperty("skill_type_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long skillTypeId;
+
+    /**
+     * 属性 [ID]
+     *
+     */
+    @JSONField(name = "id")
+    @JsonProperty("id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 属性 [NAME]
+     *
+     */
+    @JSONField(name = "name")
+    @JsonProperty("name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String name;
+
+    /**
+     * 属性 [SKILL_TYPE_NAME]
+     *
+     */
+    @JSONField(name = "skill_type_name")
+    @JsonProperty("skill_type_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String skillTypeName;
+
+    /**
+     * 属性 [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;
+
+    /**
+     * 属性 [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;
+
+    /**
+     * 属性 [CREATE_UID]
+     *
+     */
+    @JSONField(name = "create_uid")
+    @JsonProperty("create_uid")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long createUid;
+
+    /**
+     * 属性 [WRITE_UID]
+     *
+     */
+    @JSONField(name = "write_uid")
+    @JsonProperty("write_uid")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long writeUid;
+
+
+    /**
+     * 设置 [SKILL_TYPE_ID]
+     */
+    public void setSkillTypeId(Long  skillTypeId){
+        this.skillTypeId = skillTypeId ;
+        this.modify("skill_type_id",skillTypeId);
+    }
+
+    /**
+     * 设置 [NAME]
+     */
+    public void setName(String  name){
+        this.name = name ;
+        this.modify("name",name);
+    }
+
+    /**
+     * 设置 [CREATE_DATE]
+     */
+    public void setCreateDate(Timestamp  createDate){
+        this.createDate = createDate ;
+        this.modify("create_date",createDate);
+    }
+
+    /**
+     * 设置 [WRITE_DATE]
+     */
+    public void setWriteDate(Timestamp  writeDate){
+        this.writeDate = writeDate ;
+        this.modify("write_date",writeDate);
+    }
+
+    /**
+     * 设置 [CREATE_UID]
+     */
+    public void setCreateUid(Long  createUid){
+        this.createUid = createUid ;
+        this.modify("create_uid",createUid);
+    }
+
+    /**
+     * 设置 [WRITE_UID]
+     */
+    public void setWriteUid(Long  writeUid){
+        this.writeUid = writeUid ;
+        this.modify("write_uid",writeUid);
+    }
+
+
+}
+
+

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

+package cn.ibizlab.businesscentral.core.dto;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.alibaba.fastjson.annotation.JSONField;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import cn.ibizlab.businesscentral.util.domain.DTOBase;
+import cn.ibizlab.businesscentral.util.domain.DTOClient;
+import lombok.Data;
+
+/**
+ * 服务DTO对象[Hr_skill_levelDTO]
+ */
+@Data
+public class Hr_skill_levelDTO extends DTOBase implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性 [ID]
+     *
+     */
+    @JSONField(name = "id")
+    @JsonProperty("id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 属性 [NAME]
+     *
+     */
+    @JSONField(name = "name")
+    @JsonProperty("name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String name;
+
+    /**
+     * 属性 [SKILL_TYPE_ID]
+     *
+     */
+    @JSONField(name = "skill_type_id")
+    @JsonProperty("skill_type_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long skillTypeId;
+
+    /**
+     * 属性 [SKILL_TYPE_NAME]
+     *
+     */
+    @JSONField(name = "skill_type_name")
+    @JsonProperty("skill_type_name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String skillTypeName;
+
+    /**
+     * 属性 [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;
+
+    /**
+     * 属性 [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;
+
+    /**
+     * 属性 [WRITE_UID]
+     *
+     */
+    @JSONField(name = "write_uid")
+    @JsonProperty("write_uid")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long writeUid;
+
+    /**
+     * 属性 [CREATE_UID]
+     *
+     */
+    @JSONField(name = "create_uid")
+    @JsonProperty("create_uid")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long createUid;
+
+
+    /**
+     * 设置 [NAME]
+     */
+    public void setName(String  name){
+        this.name = name ;
+        this.modify("name",name);
+    }
+
+    /**
+     * 设置 [SKILL_TYPE_ID]
+     */
+    public void setSkillTypeId(Long  skillTypeId){
+        this.skillTypeId = skillTypeId ;
+        this.modify("skill_type_id",skillTypeId);
+    }
+
+    /**
+     * 设置 [WRITE_DATE]
+     */
+    public void setWriteDate(Timestamp  writeDate){
+        this.writeDate = writeDate ;
+        this.modify("write_date",writeDate);
+    }
+
+    /**
+     * 设置 [CREATE_DATE]
+     */
+    public void setCreateDate(Timestamp  createDate){
+        this.createDate = createDate ;
+        this.modify("create_date",createDate);
+    }
+
+    /**
+     * 设置 [WRITE_UID]
+     */
+    public void setWriteUid(Long  writeUid){
+        this.writeUid = writeUid ;
+        this.modify("write_uid",writeUid);
+    }
+
+    /**
+     * 设置 [CREATE_UID]
+     */
+    public void setCreateUid(Long  createUid){
+        this.createUid = createUid ;
+        this.modify("create_uid",createUid);
+    }
+
+
+}
+
+

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

+package cn.ibizlab.businesscentral.core.dto;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.alibaba.fastjson.annotation.JSONField;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import cn.ibizlab.businesscentral.util.domain.DTOBase;
+import cn.ibizlab.businesscentral.util.domain.DTOClient;
+import lombok.Data;
+
+/**
+ * 服务DTO对象[Hr_skill_typeDTO]
+ */
+@Data
+public class Hr_skill_typeDTO extends DTOBase implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性 [ID]
+     *
+     */
+    @JSONField(name = "id")
+    @JsonProperty("id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 属性 [NAME]
+     *
+     */
+    @JSONField(name = "name")
+    @JsonProperty("name")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String name;
+
+    /**
+     * 属性 [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;
+
+    /**
+     * 属性 [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;
+
+    /**
+     * 属性 [WRITE_UID]
+     *
+     */
+    @JSONField(name = "write_uid")
+    @JsonProperty("write_uid")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long writeUid;
+
+    /**
+     * 属性 [CREATE_UID]
+     *
+     */
+    @JSONField(name = "create_uid")
+    @JsonProperty("create_uid")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long createUid;
+
+
+    /**
+     * 设置 [NAME]
+     */
+    public void setName(String  name){
+        this.name = name ;
+        this.modify("name",name);
+    }
+
+    /**
+     * 设置 [WRITE_DATE]
+     */
+    public void setWriteDate(Timestamp  writeDate){
+        this.writeDate = writeDate ;
+        this.modify("write_date",writeDate);
+    }
+
+    /**
+     * 设置 [CREATE_DATE]
+     */
+    public void setCreateDate(Timestamp  createDate){
+        this.createDate = createDate ;
+        this.modify("create_date",createDate);
+    }
+
+    /**
+     * 设置 [WRITE_UID]
+     */
+    public void setWriteUid(Long  writeUid){
+        this.writeUid = writeUid ;
+        this.modify("write_uid",writeUid);
+    }
+
+    /**
+     * 设置 [CREATE_UID]
+     */
+    public void setCreateUid(Long  createUid){
+        this.createUid = createUid ;
+        this.modify("create_uid",createUid);
+    }
+
+
+}
+
+

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

@@ -144,6 +144,78 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
     private String propertySupplierPaymentTermName;
 
+    /**
+     * 属性 [TITLE_TEXT]
+     *
+     */
+    @JSONField(name = "title_text")
+    @JsonProperty("title_text")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String titleText;
+
+    /**
+     * 属性 [TITLE]
+     *
+     */
+    @JSONField(name = "title")
+    @JsonProperty("title")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long title;
+
+    /**
+     * 属性 [COMPANY_ID]
+     *
+     */
+    @JSONField(name = "company_id")
+    @JsonProperty("company_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long companyId;
+
+    /**
+     * 属性 [COMPANY_ID_TEXT]
+     *
+     */
+    @JSONField(name = "company_id_text")
+    @JsonProperty("company_id_text")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String companyIdText;
+
+    /**
+     * 属性 [COUNTRY_ID]
+     *
+     */
+    @JSONField(name = "country_id")
+    @JsonProperty("country_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long countryId;
+
+    /**
+     * 属性 [COUNTRY_ID_TEXT]
+     *
+     */
+    @JSONField(name = "country_id_text")
+    @JsonProperty("country_id_text")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String countryIdText;
+
+    /**
+     * 属性 [STATE_ID_TEXT]
+     *
+     */
+    @JSONField(name = "state_id_text")
+    @JsonProperty("state_id_text")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String stateIdText;
+
+    /**
+     * 属性 [STATE_ID]
+     *
+     */
+    @JSONField(name = "state_id")
+    @JsonProperty("state_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long stateId;
+
 
     /**
      * 设置 [NAME]
@@ -217,6 +289,38 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
         this.modify("property_supplier_payment_term_id",propertySupplierPaymentTermId);
     }
 
+    /**
+     * 设置 [TITLE]
+     */
+    public void setTitle(Long  title){
+        this.title = title ;
+        this.modify("title",title);
+    }
+
+    /**
+     * 设置 [COMPANY_ID]
+     */
+    public void setCompanyId(Long  companyId){
+        this.companyId = companyId ;
+        this.modify("company_id",companyId);
+    }
+
+    /**
+     * 设置 [COUNTRY_ID]
+     */
+    public void setCountryId(Long  countryId){
+        this.countryId = countryId ;
+        this.modify("country_id",countryId);
+    }
+
+    /**
+     * 设置 [STATE_ID]
+     */
+    public void setStateId(Long  stateId){
+        this.stateId = stateId ;
+        this.modify("state_id",stateId);
+    }
+
 
 }
 

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/mapping/Hr_employee_skillMapping.java

+package cn.ibizlab.businesscentral.core.mapping;
+
+import org.mapstruct.*;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_employee_skill;
+import cn.ibizlab.businesscentral.core.dto.Hr_employee_skillDTO;
+import cn.ibizlab.businesscentral.util.domain.MappingBase;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", uses = {},implementationName="CoreHr_employee_skillMapping",
+    nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface Hr_employee_skillMapping extends MappingBase<Hr_employee_skillDTO, Hr_employee_skill> {
+
+
+}
+

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/mapping/Hr_skillMapping.java

+package cn.ibizlab.businesscentral.core.mapping;
+
+import org.mapstruct.*;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill;
+import cn.ibizlab.businesscentral.core.dto.Hr_skillDTO;
+import cn.ibizlab.businesscentral.util.domain.MappingBase;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", uses = {},implementationName="CoreHr_skillMapping",
+    nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface Hr_skillMapping extends MappingBase<Hr_skillDTO, Hr_skill> {
+
+
+}
+

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/mapping/Hr_skill_levelMapping.java

+package cn.ibizlab.businesscentral.core.mapping;
+
+import org.mapstruct.*;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_level;
+import cn.ibizlab.businesscentral.core.dto.Hr_skill_levelDTO;
+import cn.ibizlab.businesscentral.util.domain.MappingBase;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", uses = {},implementationName="CoreHr_skill_levelMapping",
+    nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface Hr_skill_levelMapping extends MappingBase<Hr_skill_levelDTO, Hr_skill_level> {
+
+
+}
+

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/mapping/Hr_skill_typeMapping.java

+package cn.ibizlab.businesscentral.core.mapping;
+
+import org.mapstruct.*;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type;
+import cn.ibizlab.businesscentral.core.dto.Hr_skill_typeDTO;
+import cn.ibizlab.businesscentral.util.domain.MappingBase;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", uses = {},implementationName="CoreHr_skill_typeMapping",
+    nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface Hr_skill_typeMapping extends MappingBase<Hr_skill_typeDTO, Hr_skill_type> {
+
+
+}
+

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

@@ -159,5 +159,135 @@ public class Hr_leaveResource {
 	}
 
 
+    @PreAuthorize("hasPermission(this.hr_leaveMapping.toDomain(#hr_leavedto),'iBizBusinessCentral-Hr_leave-Create')")
+    @ApiOperation(value = "根据员工建立休假", tags = {"休假" },  notes = "根据员工建立休假")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_employees/{hr_employee_id}/hr_leaves")
+    public ResponseEntity<Hr_leaveDTO> createByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id, @RequestBody Hr_leaveDTO hr_leavedto) {
+        Hr_leave domain = hr_leaveMapping.toDomain(hr_leavedto);
+        domain.setFirstApproverId(hr_employee_id);
+		hr_leaveService.create(domain);
+        Hr_leaveDTO dto = hr_leaveMapping.toDto(domain);
+		return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @PreAuthorize("hasPermission(this.hr_leaveMapping.toDomain(#hr_leavedtos),'iBizBusinessCentral-Hr_leave-Create')")
+    @ApiOperation(value = "根据员工批量建立休假", tags = {"休假" },  notes = "根据员工批量建立休假")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_employees/{hr_employee_id}/hr_leaves/batch")
+    public ResponseEntity<Boolean> createBatchByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id, @RequestBody List<Hr_leaveDTO> hr_leavedtos) {
+        List<Hr_leave> domainlist=hr_leaveMapping.toDomain(hr_leavedtos);
+        for(Hr_leave domain:domainlist){
+            domain.setFirstApproverId(hr_employee_id);
+        }
+        hr_leaveService.createBatch(domainlist);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @VersionCheck(entity = "hr_leave" , versionfield = "writeDate")
+    @PreAuthorize("hasPermission(this.hr_leaveService.get(#hr_leave_id),'iBizBusinessCentral-Hr_leave-Update')")
+    @ApiOperation(value = "根据员工更新休假", tags = {"休假" },  notes = "根据员工更新休假")
+	@RequestMapping(method = RequestMethod.PUT, value = "/hr_employees/{hr_employee_id}/hr_leaves/{hr_leave_id}")
+    public ResponseEntity<Hr_leaveDTO> updateByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id, @PathVariable("hr_leave_id") Long hr_leave_id, @RequestBody Hr_leaveDTO hr_leavedto) {
+        Hr_leave domain = hr_leaveMapping.toDomain(hr_leavedto);
+        domain.setFirstApproverId(hr_employee_id);
+        domain.setId(hr_leave_id);
+		hr_leaveService.update(domain);
+        Hr_leaveDTO dto = hr_leaveMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @PreAuthorize("hasPermission(this.hr_leaveService.getHrLeaveByEntities(this.hr_leaveMapping.toDomain(#hr_leavedtos)),'iBizBusinessCentral-Hr_leave-Update')")
+    @ApiOperation(value = "根据员工批量更新休假", tags = {"休假" },  notes = "根据员工批量更新休假")
+	@RequestMapping(method = RequestMethod.PUT, value = "/hr_employees/{hr_employee_id}/hr_leaves/batch")
+    public ResponseEntity<Boolean> updateBatchByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id, @RequestBody List<Hr_leaveDTO> hr_leavedtos) {
+        List<Hr_leave> domainlist=hr_leaveMapping.toDomain(hr_leavedtos);
+        for(Hr_leave domain:domainlist){
+            domain.setFirstApproverId(hr_employee_id);
+        }
+        hr_leaveService.updateBatch(domainlist);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasPermission(this.hr_leaveService.get(#hr_leave_id),'iBizBusinessCentral-Hr_leave-Remove')")
+    @ApiOperation(value = "根据员工删除休假", tags = {"休假" },  notes = "根据员工删除休假")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/hr_employees/{hr_employee_id}/hr_leaves/{hr_leave_id}")
+    public ResponseEntity<Boolean> removeByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id, @PathVariable("hr_leave_id") Long hr_leave_id) {
+		return ResponseEntity.status(HttpStatus.OK).body(hr_leaveService.remove(hr_leave_id));
+    }
+
+    @PreAuthorize("hasPermission(this.hr_leaveService.getHrLeaveByIds(#ids),'iBizBusinessCentral-Hr_leave-Remove')")
+    @ApiOperation(value = "根据员工批量删除休假", tags = {"休假" },  notes = "根据员工批量删除休假")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/hr_employees/{hr_employee_id}/hr_leaves/batch")
+    public ResponseEntity<Boolean> removeBatchByHr_employee(@RequestBody List<Long> ids) {
+        hr_leaveService.removeBatch(ids);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PostAuthorize("hasPermission(this.hr_leaveMapping.toDomain(returnObject.body),'iBizBusinessCentral-Hr_leave-Get')")
+    @ApiOperation(value = "根据员工获取休假", tags = {"休假" },  notes = "根据员工获取休假")
+	@RequestMapping(method = RequestMethod.GET, value = "/hr_employees/{hr_employee_id}/hr_leaves/{hr_leave_id}")
+    public ResponseEntity<Hr_leaveDTO> getByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id, @PathVariable("hr_leave_id") Long hr_leave_id) {
+        Hr_leave domain = hr_leaveService.get(hr_leave_id);
+        Hr_leaveDTO dto = hr_leaveMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @ApiOperation(value = "根据员工获取休假草稿", tags = {"休假" },  notes = "根据员工获取休假草稿")
+    @RequestMapping(method = RequestMethod.GET, value = "/hr_employees/{hr_employee_id}/hr_leaves/getdraft")
+    public ResponseEntity<Hr_leaveDTO> getDraftByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id) {
+        Hr_leave domain = new Hr_leave();
+        domain.setFirstApproverId(hr_employee_id);
+        return ResponseEntity.status(HttpStatus.OK).body(hr_leaveMapping.toDto(hr_leaveService.getDraft(domain)));
+    }
+
+    @ApiOperation(value = "根据员工检查休假", tags = {"休假" },  notes = "根据员工检查休假")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_employees/{hr_employee_id}/hr_leaves/checkkey")
+    public ResponseEntity<Boolean> checkKeyByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id, @RequestBody Hr_leaveDTO hr_leavedto) {
+        return  ResponseEntity.status(HttpStatus.OK).body(hr_leaveService.checkKey(hr_leaveMapping.toDomain(hr_leavedto)));
+    }
+
+    @PreAuthorize("hasPermission(this.hr_leaveMapping.toDomain(#hr_leavedto),'iBizBusinessCentral-Hr_leave-Save')")
+    @ApiOperation(value = "根据员工保存休假", tags = {"休假" },  notes = "根据员工保存休假")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_employees/{hr_employee_id}/hr_leaves/save")
+    public ResponseEntity<Boolean> saveByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id, @RequestBody Hr_leaveDTO hr_leavedto) {
+        Hr_leave domain = hr_leaveMapping.toDomain(hr_leavedto);
+        domain.setFirstApproverId(hr_employee_id);
+        return ResponseEntity.status(HttpStatus.OK).body(hr_leaveService.save(domain));
+    }
+
+    @PreAuthorize("hasPermission(this.hr_leaveMapping.toDomain(#hr_leavedtos),'iBizBusinessCentral-Hr_leave-Save')")
+    @ApiOperation(value = "根据员工批量保存休假", tags = {"休假" },  notes = "根据员工批量保存休假")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_employees/{hr_employee_id}/hr_leaves/savebatch")
+    public ResponseEntity<Boolean> saveBatchByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id, @RequestBody List<Hr_leaveDTO> hr_leavedtos) {
+        List<Hr_leave> domainlist=hr_leaveMapping.toDomain(hr_leavedtos);
+        for(Hr_leave domain:domainlist){
+             domain.setFirstApproverId(hr_employee_id);
+        }
+        hr_leaveService.saveBatch(domainlist);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_leave-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Hr_leave-Get')")
+	@ApiOperation(value = "根据员工获取数据集", tags = {"休假" } ,notes = "根据员工获取数据集")
+    @RequestMapping(method= RequestMethod.GET , value="/hr_employees/{hr_employee_id}/hr_leaves/fetchdefault")
+	public ResponseEntity<List<Hr_leaveDTO>> fetchHr_leaveDefaultByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id,Hr_leaveSearchContext context) {
+        context.setN_first_approver_id_eq(hr_employee_id);
+        Page<Hr_leave> domains = hr_leaveService.searchDefault(context) ;
+        List<Hr_leaveDTO> list = hr_leaveMapping.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_leave-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Hr_leave-Get')")
+	@ApiOperation(value = "根据员工查询数据集", tags = {"休假" } ,notes = "根据员工查询数据集")
+    @RequestMapping(method= RequestMethod.POST , value="/hr_employees/{hr_employee_id}/hr_leaves/searchdefault")
+	public ResponseEntity<Page<Hr_leaveDTO>> searchHr_leaveDefaultByHr_employee(@PathVariable("hr_employee_id") Long hr_employee_id, @RequestBody Hr_leaveSearchContext context) {
+        context.setN_first_approver_id_eq(hr_employee_id);
+        Page<Hr_leave> domains = hr_leaveService.searchDefault(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(hr_leaveMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
 }
 

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

+package cn.ibizlab.businesscentral.core.rest;
+
+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 lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
+import javax.servlet.ServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.StringUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.access.prepost.PostAuthorize;
+import org.springframework.validation.annotation.Validated;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import cn.ibizlab.businesscentral.core.dto.*;
+import cn.ibizlab.businesscentral.core.mapping.*;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill;
+import cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skillService;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skillSearchContext;
+import cn.ibizlab.businesscentral.util.annotation.VersionCheck;
+
+@Slf4j
+@Api(tags = {"技能" })
+@RestController("Core-hr_skill")
+@RequestMapping("")
+public class Hr_skillResource {
+
+    @Autowired
+    public IHr_skillService hr_skillService;
+
+    @Autowired
+    @Lazy
+    public Hr_skillMapping hr_skillMapping;
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill-Create-all')")
+    @ApiOperation(value = "新建技能", tags = {"技能" },  notes = "新建技能")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skills")
+    public ResponseEntity<Hr_skillDTO> create(@Validated @RequestBody Hr_skillDTO hr_skilldto) {
+        Hr_skill domain = hr_skillMapping.toDomain(hr_skilldto);
+		hr_skillService.create(domain);
+        Hr_skillDTO dto = hr_skillMapping.toDto(domain);
+		return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill-Create-all')")
+    @ApiOperation(value = "批量新建技能", tags = {"技能" },  notes = "批量新建技能")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skills/batch")
+    public ResponseEntity<Boolean> createBatch(@RequestBody List<Hr_skillDTO> hr_skilldtos) {
+        hr_skillService.createBatch(hr_skillMapping.toDomain(hr_skilldtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill-Update-all')")
+    @ApiOperation(value = "更新技能", tags = {"技能" },  notes = "更新技能")
+	@RequestMapping(method = RequestMethod.PUT, value = "/hr_skills/{hr_skill_id}")
+    public ResponseEntity<Hr_skillDTO> update(@PathVariable("hr_skill_id") Long hr_skill_id, @RequestBody Hr_skillDTO hr_skilldto) {
+		Hr_skill domain  = hr_skillMapping.toDomain(hr_skilldto);
+        domain .setId(hr_skill_id);
+		hr_skillService.update(domain );
+		Hr_skillDTO dto = hr_skillMapping.toDto(domain );
+        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill-Update-all')")
+    @ApiOperation(value = "批量更新技能", tags = {"技能" },  notes = "批量更新技能")
+	@RequestMapping(method = RequestMethod.PUT, value = "/hr_skills/batch")
+    public ResponseEntity<Boolean> updateBatch(@RequestBody List<Hr_skillDTO> hr_skilldtos) {
+        hr_skillService.updateBatch(hr_skillMapping.toDomain(hr_skilldtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill-Remove-all')")
+    @ApiOperation(value = "删除技能", tags = {"技能" },  notes = "删除技能")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/hr_skills/{hr_skill_id}")
+    public ResponseEntity<Boolean> remove(@PathVariable("hr_skill_id") Long hr_skill_id) {
+         return ResponseEntity.status(HttpStatus.OK).body(hr_skillService.remove(hr_skill_id));
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill-Remove-all')")
+    @ApiOperation(value = "批量删除技能", tags = {"技能" },  notes = "批量删除技能")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/hr_skills/batch")
+    public ResponseEntity<Boolean> removeBatch(@RequestBody List<Long> ids) {
+        hr_skillService.removeBatch(ids);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill-Get-all')")
+    @ApiOperation(value = "获取技能", tags = {"技能" },  notes = "获取技能")
+	@RequestMapping(method = RequestMethod.GET, value = "/hr_skills/{hr_skill_id}")
+    public ResponseEntity<Hr_skillDTO> get(@PathVariable("hr_skill_id") Long hr_skill_id) {
+        Hr_skill domain = hr_skillService.get(hr_skill_id);
+        Hr_skillDTO dto = hr_skillMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @ApiOperation(value = "获取技能草稿", tags = {"技能" },  notes = "获取技能草稿")
+	@RequestMapping(method = RequestMethod.GET, value = "/hr_skills/getdraft")
+    public ResponseEntity<Hr_skillDTO> getDraft() {
+        return ResponseEntity.status(HttpStatus.OK).body(hr_skillMapping.toDto(hr_skillService.getDraft(new Hr_skill())));
+    }
+
+    @ApiOperation(value = "检查技能", tags = {"技能" },  notes = "检查技能")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skills/checkkey")
+    public ResponseEntity<Boolean> checkKey(@RequestBody Hr_skillDTO hr_skilldto) {
+        return  ResponseEntity.status(HttpStatus.OK).body(hr_skillService.checkKey(hr_skillMapping.toDomain(hr_skilldto)));
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill-Save-all')")
+    @ApiOperation(value = "保存技能", tags = {"技能" },  notes = "保存技能")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skills/save")
+    public ResponseEntity<Boolean> save(@RequestBody Hr_skillDTO hr_skilldto) {
+        return ResponseEntity.status(HttpStatus.OK).body(hr_skillService.save(hr_skillMapping.toDomain(hr_skilldto)));
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill-Save-all')")
+    @ApiOperation(value = "批量保存技能", tags = {"技能" },  notes = "批量保存技能")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skills/savebatch")
+    public ResponseEntity<Boolean> saveBatch(@RequestBody List<Hr_skillDTO> hr_skilldtos) {
+        hr_skillService.saveBatch(hr_skillMapping.toDomain(hr_skilldtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill-searchDefault-all')")
+	@ApiOperation(value = "获取数据集", tags = {"技能" } ,notes = "获取数据集")
+    @RequestMapping(method= RequestMethod.GET , value="/hr_skills/fetchdefault")
+	public ResponseEntity<List<Hr_skillDTO>> fetchDefault(Hr_skillSearchContext context) {
+        Page<Hr_skill> domains = hr_skillService.searchDefault(context) ;
+        List<Hr_skillDTO> list = hr_skillMapping.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_skill-searchDefault-all')")
+	@ApiOperation(value = "查询数据集", tags = {"技能" } ,notes = "查询数据集")
+    @RequestMapping(method= RequestMethod.POST , value="/hr_skills/searchdefault")
+	public ResponseEntity<Page<Hr_skillDTO>> searchDefault(@RequestBody Hr_skillSearchContext context) {
+        Page<Hr_skill> domains = hr_skillService.searchDefault(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(hr_skillMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
+
+
+}
+

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

+package cn.ibizlab.businesscentral.core.rest;
+
+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 lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
+import javax.servlet.ServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.StringUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.access.prepost.PostAuthorize;
+import org.springframework.validation.annotation.Validated;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import cn.ibizlab.businesscentral.core.dto.*;
+import cn.ibizlab.businesscentral.core.mapping.*;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_level;
+import cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skill_levelService;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skill_levelSearchContext;
+import cn.ibizlab.businesscentral.util.annotation.VersionCheck;
+
+@Slf4j
+@Api(tags = {"技能等级" })
+@RestController("Core-hr_skill_level")
+@RequestMapping("")
+public class Hr_skill_levelResource {
+
+    @Autowired
+    public IHr_skill_levelService hr_skill_levelService;
+
+    @Autowired
+    @Lazy
+    public Hr_skill_levelMapping hr_skill_levelMapping;
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_level-Create-all')")
+    @ApiOperation(value = "新建技能等级", tags = {"技能等级" },  notes = "新建技能等级")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skill_levels")
+    public ResponseEntity<Hr_skill_levelDTO> create(@Validated @RequestBody Hr_skill_levelDTO hr_skill_leveldto) {
+        Hr_skill_level domain = hr_skill_levelMapping.toDomain(hr_skill_leveldto);
+		hr_skill_levelService.create(domain);
+        Hr_skill_levelDTO dto = hr_skill_levelMapping.toDto(domain);
+		return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_level-Create-all')")
+    @ApiOperation(value = "批量新建技能等级", tags = {"技能等级" },  notes = "批量新建技能等级")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skill_levels/batch")
+    public ResponseEntity<Boolean> createBatch(@RequestBody List<Hr_skill_levelDTO> hr_skill_leveldtos) {
+        hr_skill_levelService.createBatch(hr_skill_levelMapping.toDomain(hr_skill_leveldtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_level-Update-all')")
+    @ApiOperation(value = "更新技能等级", tags = {"技能等级" },  notes = "更新技能等级")
+	@RequestMapping(method = RequestMethod.PUT, value = "/hr_skill_levels/{hr_skill_level_id}")
+    public ResponseEntity<Hr_skill_levelDTO> update(@PathVariable("hr_skill_level_id") Long hr_skill_level_id, @RequestBody Hr_skill_levelDTO hr_skill_leveldto) {
+		Hr_skill_level domain  = hr_skill_levelMapping.toDomain(hr_skill_leveldto);
+        domain .setId(hr_skill_level_id);
+		hr_skill_levelService.update(domain );
+		Hr_skill_levelDTO dto = hr_skill_levelMapping.toDto(domain );
+        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_level-Update-all')")
+    @ApiOperation(value = "批量更新技能等级", tags = {"技能等级" },  notes = "批量更新技能等级")
+	@RequestMapping(method = RequestMethod.PUT, value = "/hr_skill_levels/batch")
+    public ResponseEntity<Boolean> updateBatch(@RequestBody List<Hr_skill_levelDTO> hr_skill_leveldtos) {
+        hr_skill_levelService.updateBatch(hr_skill_levelMapping.toDomain(hr_skill_leveldtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_level-Remove-all')")
+    @ApiOperation(value = "删除技能等级", tags = {"技能等级" },  notes = "删除技能等级")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/hr_skill_levels/{hr_skill_level_id}")
+    public ResponseEntity<Boolean> remove(@PathVariable("hr_skill_level_id") Long hr_skill_level_id) {
+         return ResponseEntity.status(HttpStatus.OK).body(hr_skill_levelService.remove(hr_skill_level_id));
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_level-Remove-all')")
+    @ApiOperation(value = "批量删除技能等级", tags = {"技能等级" },  notes = "批量删除技能等级")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/hr_skill_levels/batch")
+    public ResponseEntity<Boolean> removeBatch(@RequestBody List<Long> ids) {
+        hr_skill_levelService.removeBatch(ids);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_level-Get-all')")
+    @ApiOperation(value = "获取技能等级", tags = {"技能等级" },  notes = "获取技能等级")
+	@RequestMapping(method = RequestMethod.GET, value = "/hr_skill_levels/{hr_skill_level_id}")
+    public ResponseEntity<Hr_skill_levelDTO> get(@PathVariable("hr_skill_level_id") Long hr_skill_level_id) {
+        Hr_skill_level domain = hr_skill_levelService.get(hr_skill_level_id);
+        Hr_skill_levelDTO dto = hr_skill_levelMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @ApiOperation(value = "获取技能等级草稿", tags = {"技能等级" },  notes = "获取技能等级草稿")
+	@RequestMapping(method = RequestMethod.GET, value = "/hr_skill_levels/getdraft")
+    public ResponseEntity<Hr_skill_levelDTO> getDraft() {
+        return ResponseEntity.status(HttpStatus.OK).body(hr_skill_levelMapping.toDto(hr_skill_levelService.getDraft(new Hr_skill_level())));
+    }
+
+    @ApiOperation(value = "检查技能等级", tags = {"技能等级" },  notes = "检查技能等级")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skill_levels/checkkey")
+    public ResponseEntity<Boolean> checkKey(@RequestBody Hr_skill_levelDTO hr_skill_leveldto) {
+        return  ResponseEntity.status(HttpStatus.OK).body(hr_skill_levelService.checkKey(hr_skill_levelMapping.toDomain(hr_skill_leveldto)));
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_level-Save-all')")
+    @ApiOperation(value = "保存技能等级", tags = {"技能等级" },  notes = "保存技能等级")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skill_levels/save")
+    public ResponseEntity<Boolean> save(@RequestBody Hr_skill_levelDTO hr_skill_leveldto) {
+        return ResponseEntity.status(HttpStatus.OK).body(hr_skill_levelService.save(hr_skill_levelMapping.toDomain(hr_skill_leveldto)));
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_level-Save-all')")
+    @ApiOperation(value = "批量保存技能等级", tags = {"技能等级" },  notes = "批量保存技能等级")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skill_levels/savebatch")
+    public ResponseEntity<Boolean> saveBatch(@RequestBody List<Hr_skill_levelDTO> hr_skill_leveldtos) {
+        hr_skill_levelService.saveBatch(hr_skill_levelMapping.toDomain(hr_skill_leveldtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_level-searchDefault-all')")
+	@ApiOperation(value = "获取数据集", tags = {"技能等级" } ,notes = "获取数据集")
+    @RequestMapping(method= RequestMethod.GET , value="/hr_skill_levels/fetchdefault")
+	public ResponseEntity<List<Hr_skill_levelDTO>> fetchDefault(Hr_skill_levelSearchContext context) {
+        Page<Hr_skill_level> domains = hr_skill_levelService.searchDefault(context) ;
+        List<Hr_skill_levelDTO> list = hr_skill_levelMapping.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_skill_level-searchDefault-all')")
+	@ApiOperation(value = "查询数据集", tags = {"技能等级" } ,notes = "查询数据集")
+    @RequestMapping(method= RequestMethod.POST , value="/hr_skill_levels/searchdefault")
+	public ResponseEntity<Page<Hr_skill_levelDTO>> searchDefault(@RequestBody Hr_skill_levelSearchContext context) {
+        Page<Hr_skill_level> domains = hr_skill_levelService.searchDefault(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(hr_skill_levelMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
+
+
+}
+

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

+package cn.ibizlab.businesscentral.core.rest;
+
+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 lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
+import javax.servlet.ServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.StringUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.access.prepost.PostAuthorize;
+import org.springframework.validation.annotation.Validated;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import cn.ibizlab.businesscentral.core.dto.*;
+import cn.ibizlab.businesscentral.core.mapping.*;
+import cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_skill_type;
+import cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_skill_typeService;
+import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_skill_typeSearchContext;
+import cn.ibizlab.businesscentral.util.annotation.VersionCheck;
+
+@Slf4j
+@Api(tags = {"技能类型" })
+@RestController("Core-hr_skill_type")
+@RequestMapping("")
+public class Hr_skill_typeResource {
+
+    @Autowired
+    public IHr_skill_typeService hr_skill_typeService;
+
+    @Autowired
+    @Lazy
+    public Hr_skill_typeMapping hr_skill_typeMapping;
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_type-Create-all')")
+    @ApiOperation(value = "新建技能类型", tags = {"技能类型" },  notes = "新建技能类型")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skill_types")
+    public ResponseEntity<Hr_skill_typeDTO> create(@Validated @RequestBody Hr_skill_typeDTO hr_skill_typedto) {
+        Hr_skill_type domain = hr_skill_typeMapping.toDomain(hr_skill_typedto);
+		hr_skill_typeService.create(domain);
+        Hr_skill_typeDTO dto = hr_skill_typeMapping.toDto(domain);
+		return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_type-Create-all')")
+    @ApiOperation(value = "批量新建技能类型", tags = {"技能类型" },  notes = "批量新建技能类型")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skill_types/batch")
+    public ResponseEntity<Boolean> createBatch(@RequestBody List<Hr_skill_typeDTO> hr_skill_typedtos) {
+        hr_skill_typeService.createBatch(hr_skill_typeMapping.toDomain(hr_skill_typedtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_type-Update-all')")
+    @ApiOperation(value = "更新技能类型", tags = {"技能类型" },  notes = "更新技能类型")
+	@RequestMapping(method = RequestMethod.PUT, value = "/hr_skill_types/{hr_skill_type_id}")
+    public ResponseEntity<Hr_skill_typeDTO> update(@PathVariable("hr_skill_type_id") Long hr_skill_type_id, @RequestBody Hr_skill_typeDTO hr_skill_typedto) {
+		Hr_skill_type domain  = hr_skill_typeMapping.toDomain(hr_skill_typedto);
+        domain .setId(hr_skill_type_id);
+		hr_skill_typeService.update(domain );
+		Hr_skill_typeDTO dto = hr_skill_typeMapping.toDto(domain );
+        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_type-Update-all')")
+    @ApiOperation(value = "批量更新技能类型", tags = {"技能类型" },  notes = "批量更新技能类型")
+	@RequestMapping(method = RequestMethod.PUT, value = "/hr_skill_types/batch")
+    public ResponseEntity<Boolean> updateBatch(@RequestBody List<Hr_skill_typeDTO> hr_skill_typedtos) {
+        hr_skill_typeService.updateBatch(hr_skill_typeMapping.toDomain(hr_skill_typedtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_type-Remove-all')")
+    @ApiOperation(value = "删除技能类型", tags = {"技能类型" },  notes = "删除技能类型")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/hr_skill_types/{hr_skill_type_id}")
+    public ResponseEntity<Boolean> remove(@PathVariable("hr_skill_type_id") Long hr_skill_type_id) {
+         return ResponseEntity.status(HttpStatus.OK).body(hr_skill_typeService.remove(hr_skill_type_id));
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_type-Remove-all')")
+    @ApiOperation(value = "批量删除技能类型", tags = {"技能类型" },  notes = "批量删除技能类型")
+	@RequestMapping(method = RequestMethod.DELETE, value = "/hr_skill_types/batch")
+    public ResponseEntity<Boolean> removeBatch(@RequestBody List<Long> ids) {
+        hr_skill_typeService.removeBatch(ids);
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_type-Get-all')")
+    @ApiOperation(value = "获取技能类型", tags = {"技能类型" },  notes = "获取技能类型")
+	@RequestMapping(method = RequestMethod.GET, value = "/hr_skill_types/{hr_skill_type_id}")
+    public ResponseEntity<Hr_skill_typeDTO> get(@PathVariable("hr_skill_type_id") Long hr_skill_type_id) {
+        Hr_skill_type domain = hr_skill_typeService.get(hr_skill_type_id);
+        Hr_skill_typeDTO dto = hr_skill_typeMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(dto);
+    }
+
+    @ApiOperation(value = "获取技能类型草稿", tags = {"技能类型" },  notes = "获取技能类型草稿")
+	@RequestMapping(method = RequestMethod.GET, value = "/hr_skill_types/getdraft")
+    public ResponseEntity<Hr_skill_typeDTO> getDraft() {
+        return ResponseEntity.status(HttpStatus.OK).body(hr_skill_typeMapping.toDto(hr_skill_typeService.getDraft(new Hr_skill_type())));
+    }
+
+    @ApiOperation(value = "检查技能类型", tags = {"技能类型" },  notes = "检查技能类型")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skill_types/checkkey")
+    public ResponseEntity<Boolean> checkKey(@RequestBody Hr_skill_typeDTO hr_skill_typedto) {
+        return  ResponseEntity.status(HttpStatus.OK).body(hr_skill_typeService.checkKey(hr_skill_typeMapping.toDomain(hr_skill_typedto)));
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_type-Save-all')")
+    @ApiOperation(value = "保存技能类型", tags = {"技能类型" },  notes = "保存技能类型")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skill_types/save")
+    public ResponseEntity<Boolean> save(@RequestBody Hr_skill_typeDTO hr_skill_typedto) {
+        return ResponseEntity.status(HttpStatus.OK).body(hr_skill_typeService.save(hr_skill_typeMapping.toDomain(hr_skill_typedto)));
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_type-Save-all')")
+    @ApiOperation(value = "批量保存技能类型", tags = {"技能类型" },  notes = "批量保存技能类型")
+	@RequestMapping(method = RequestMethod.POST, value = "/hr_skill_types/savebatch")
+    public ResponseEntity<Boolean> saveBatch(@RequestBody List<Hr_skill_typeDTO> hr_skill_typedtos) {
+        hr_skill_typeService.saveBatch(hr_skill_typeMapping.toDomain(hr_skill_typedtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_skill_type-searchDefault-all')")
+	@ApiOperation(value = "获取数据集", tags = {"技能类型" } ,notes = "获取数据集")
+    @RequestMapping(method= RequestMethod.GET , value="/hr_skill_types/fetchdefault")
+	public ResponseEntity<List<Hr_skill_typeDTO>> fetchDefault(Hr_skill_typeSearchContext context) {
+        Page<Hr_skill_type> domains = hr_skill_typeService.searchDefault(context) ;
+        List<Hr_skill_typeDTO> list = hr_skill_typeMapping.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_skill_type-searchDefault-all')")
+	@ApiOperation(value = "查询数据集", tags = {"技能类型" } ,notes = "查询数据集")
+    @RequestMapping(method= RequestMethod.POST , value="/hr_skill_types/searchdefault")
+	public ResponseEntity<Page<Hr_skill_typeDTO>> searchDefault(@RequestBody Hr_skill_typeSearchContext context) {
+        Page<Hr_skill_type> domains = hr_skill_typeService.searchDefault(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(hr_skill_typeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
+
+
+}
+