Merge branch 'master' of http://demo.ibizlab.cn/iBizEBS/iBizBusinessCentral

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/extensions/service/Account_taxExService.java

+package cn.ibizlab.businesscentral.core.extensions.service;
+
+import cn.ibizlab.businesscentral.core.odoo_account.service.impl.Account_taxServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import cn.ibizlab.businesscentral.core.odoo_account.domain.Account_tax;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Primary;
+import java.util.*;
+
+/**
+ * 实体[税率] 自定义服务对象
+ */
+@Slf4j
+@Primary
+@Service("Account_taxExService")
+public class Account_taxExService extends Account_taxServiceImpl {
+
+    @Override
+    protected Class currentModelClass() {
+        return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
+    }
+
+    /**
+     * 自定义行为[Calc_tax]用户扩展
+     * @param et
+     * @return
+     */
+    @Override
+    @Transactional
+    public Account_tax calc_tax(Account_tax et) {
+        return super.calc_tax(et);
+    }
+}
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/extensions/service/Res_config_settingsExService.java

@@ -21,6 +21,16 @@ public class Res_config_settingsExService extends Res_config_settingsServiceImpl
         return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
     }
 
+    /**
+     * 自定义行为[GetLatestSettings]用户扩展
+     * @param et
+     * @return
+     */
+    @Override
+    @Transactional
+    public Res_config_settings getLatestSettings(Res_config_settings et) {
+        return super.getLatestSettings(et);
+    }
     /**
      * 自定义行为[Get_default]用户扩展
      * @param et

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/client/account_taxFallback.java

@@ -64,6 +64,10 @@ public class account_taxFallback implements account_taxFeignClient{
 
 
 
+    public Account_tax calc_tax( Long id, Account_tax account_tax){
+            return null;
+     }
+
     public Boolean checkKey(Account_tax account_tax){
             return false;
      }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/client/account_taxFeignClient.java

@@ -60,6 +60,10 @@ public interface account_taxFeignClient {
     Account_tax getDraft();
 
 
+    @RequestMapping(method = RequestMethod.POST, value = "/account_taxes/{id}/calc_tax")
+    Account_tax calc_tax(@PathVariable("id") Long id,@RequestBody Account_tax account_tax);
+
+
     @RequestMapping(method = RequestMethod.POST, value = "/account_taxes/checkkey")
     Boolean checkKey(@RequestBody Account_tax account_tax);
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/domain/Account_account.java

@@ -207,7 +207,7 @@ public class Account_account extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -343,14 +343,6 @@ public class Account_account extends EntityMP implements Serializable {
         this.modify("name",name);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [组]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/domain/Account_tax.java

@@ -258,7 +258,7 @@ public class Account_tax extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -410,14 +410,6 @@ public class Account_tax extends EntityMP implements Serializable {
         this.modify("tax_group_id",taxGroupId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/service/IAccount_taxService.java

@@ -33,6 +33,7 @@ public interface IAccount_taxService extends IService<Account_tax>{
     void removeBatch(Collection<Long> idList) ;
     Account_tax get(Long key) ;
     Account_tax getDraft(Account_tax et) ;
+    Account_tax calc_tax(Account_tax et) ;
     boolean checkKey(Account_tax et) ;
     boolean save(Account_tax et) ;
     void saveBatch(List<Account_tax> list) ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/service/impl/Account_taxServiceImpl.java

@@ -208,6 +208,13 @@ public class Account_taxServiceImpl extends EBSServiceImpl<Account_taxMapper, Ac
         return et;
     }
 
+    @Override
+    @Transactional
+    public Account_tax calc_tax(Account_tax et) {
+        //自定义代码
+        return et;
+    }
+
     @Override
     public boolean checkKey(Account_tax et) {
         return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));

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

@@ -69,6 +69,10 @@ public class res_config_settingsFallback implements res_config_settingsFeignClie
      }
 
 
+    public Res_config_settings getLatestSettings( Long id, Res_config_settings res_config_settings){
+            return null;
+     }
+
     public Res_config_settings get_default( Long id, Res_config_settings res_config_settings){
             return null;
      }

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

@@ -64,6 +64,10 @@ public interface res_config_settingsFeignClient {
     Boolean checkKey(@RequestBody Res_config_settings res_config_settings);
 
 
+    @RequestMapping(method = RequestMethod.GET, value = "/res_config_settings/{id}/getlatestsettings")
+    Res_config_settings getLatestSettings(@PathVariable("id") Long id,@RequestBody Res_config_settings res_config_settings);
+
+
     @RequestMapping(method = RequestMethod.GET, value = "/res_config_settings/{id}/get_default")
     Res_config_settings get_default(@PathVariable("id") Long id,@RequestBody Res_config_settings res_config_settings);
 

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

@@ -80,6 +80,11 @@ public class res_usersFallback implements res_usersFeignClient{
             return false;
      }
 
+    public Page<Res_users> searchActive(Res_usersSearchContext context){
+            return null;
+     }
+
+
     public Page<Res_users> searchDefault(Res_usersSearchContext context){
             return null;
      }

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

@@ -76,6 +76,11 @@ public interface res_usersFeignClient {
 
 
 
+    @RequestMapping(method = RequestMethod.POST, value = "/res_users/searchactive")
+    Page<Res_users> searchActive(@RequestBody Res_usersSearchContext context);
+
+
+
     @RequestMapping(method = RequestMethod.POST, value = "/res_users/searchdefault")
     Page<Res_users> searchDefault(@RequestBody Res_usersSearchContext context);
 

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

@@ -1877,6 +1877,14 @@ public class Res_config_settings extends EntityMP implements Serializable {
     @JSONField(name = "write_uid")
     @JsonProperty("write_uid")
     private Long writeUid;
+    /**
+     * 技能管理
+     */
+    @DEField(name = "module_hr_skills")
+    @TableField(value = "module_hr_skills")
+    @JSONField(name = "module_hr_skills")
+    @JsonProperty("module_hr_skills")
+    private Boolean moduleHrSkills;
 
     /**
      * 
@@ -3144,6 +3152,14 @@ public class Res_config_settings extends EntityMP implements Serializable {
         this.modify("auth_signup_template_user_id",authSignupTemplateUserId);
     }
 
+    /**
+     * 设置 [技能管理]
+     */
+    public void setModuleHrSkills(Boolean moduleHrSkills){
+        this.moduleHrSkills = moduleHrSkills ;
+        this.modify("module_hr_skills",moduleHrSkills);
+    }
+
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

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

@@ -155,7 +155,7 @@ public class Res_supplier extends EntityMP implements Serializable {
     /**
      * ID
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -556,14 +556,6 @@ public class Res_supplier extends EntityMP implements Serializable {
         this.modify("title",title);
     }
 
-    /**
-     * 设置 [ID]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [ID]
      */

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

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
 
 public interface Res_usersMapper extends BaseMapper<Res_users>{
 
+    Page<Res_users> searchActive(IPage page, @Param("srf") Res_usersSearchContext context, @Param("ew") Wrapper<Res_users> wrapper) ;
     Page<Res_users> searchDefault(IPage page, @Param("srf") Res_usersSearchContext context, @Param("ew") Wrapper<Res_users> wrapper) ;
     @Override
     Res_users selectById(Serializable id);

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

@@ -34,6 +34,7 @@ public interface IRes_config_settingsService extends IService<Res_config_setting
     Res_config_settings get(Long key) ;
     Res_config_settings getDraft(Res_config_settings et) ;
     boolean checkKey(Res_config_settings et) ;
+    Res_config_settings getLatestSettings(Res_config_settings et) ;
     Res_config_settings get_default(Res_config_settings et) ;
     boolean save(Res_config_settings et) ;
     void saveBatch(List<Res_config_settings> list) ;

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

@@ -83,6 +83,8 @@ public interface IRes_supplierService extends IService<Res_supplier>{
      */
     boolean execute(String sql, Map param);
 
+    List<Res_supplier> getResSupplierByIds(List<Long> ids) ;
+    List<Res_supplier> getResSupplierByEntities(List<Res_supplier> entities) ;
 }
 
 

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

@@ -37,6 +37,7 @@ public interface IRes_usersService extends IService<Res_users>{
     boolean checkKey(Res_users et) ;
     boolean save(Res_users et) ;
     void saveBatch(List<Res_users> list) ;
+    Page<Res_users> searchActive(Res_usersSearchContext context) ;
     Page<Res_users> searchDefault(Res_usersSearchContext context) ;
     List<Res_users> selectBySaleTeamId(Long id);
     void resetBySaleTeamId(Long id);

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

@@ -176,6 +176,13 @@ public class Res_config_settingsServiceImpl extends EBSServiceImpl<Res_config_se
     public boolean checkKey(Res_config_settings et) {
         return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
     }
+    @Override
+    @Transactional
+    public Res_config_settings getLatestSettings(Res_config_settings et) {
+        //自定义代码
+        return et;
+    }
+
     @Override
     @Transactional
     public Res_config_settings get_default(Res_config_settings et) {

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

@@ -591,6 +591,25 @@ public class Res_supplierServiceImpl extends EBSServiceImpl<Res_supplierMapper,
         return true;
     }
 
+    @Override
+    public List<Res_supplier> getResSupplierByIds(List<Long> ids) {
+         return this.listByIds(ids);
+    }
+
+    @Override
+    public List<Res_supplier> getResSupplierByEntities(List<Res_supplier> entities) {
+        List ids =new ArrayList();
+        for(Res_supplier entity : entities){
+            Serializable id=entity.getId();
+            if(!ObjectUtils.isEmpty(id)){
+                ids.add(id);
+            }
+        }
+        if(ids.size()>0)
+           return this.listByIds(ids);
+        else
+           return entities;
+    }
 
 
 

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

@@ -1551,6 +1551,15 @@ public class Res_usersServiceImpl extends EBSServiceImpl<Res_usersMapper, Res_us
     }
 
 
+    /**
+     * 查询集合 有效用户
+     */
+    @Override
+    public Page<Res_users> searchActive(Res_usersSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Res_users> pages=baseMapper.searchActive(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Res_users>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
     /**
      * 查询集合 数据集
      */

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

@@ -554,6 +554,29 @@ public class Hr_job extends EntityMP implements Serializable {
     @JSONField(name = "user_id")
     @JsonProperty("user_id")
     private Long userId;
+    /**
+     * 面试表单
+     */
+    @DEField(name = "survey_id")
+    @TableField(value = "survey_id")
+    @JSONField(name = "survey_id")
+    @JsonProperty("survey_id")
+    private Long surveyId;
+    /**
+     * 面试表单
+     */
+    @TableField(exist = false)
+    @JSONField(name = "survey_title")
+    @JsonProperty("survey_title")
+    private String surveyTitle;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_survey.domain.Survey_survey odooSurvey;
 
     /**
      * 
@@ -821,6 +844,14 @@ public class Hr_job extends EntityMP implements Serializable {
         this.modify("user_id",userId);
     }
 
+    /**
+     * 设置 [面试表单]
+     */
+    public void setSurveyId(Long surveyId){
+        this.surveyId = surveyId ;
+        this.modify("survey_id",surveyId);
+    }
+
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

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

@@ -216,6 +216,27 @@ public class Hr_jobSearchContext extends QueryWrapperContext<Hr_job> {
             this.getSearchCond().eq("user_id", n_user_id_eq);
         }
     }
+	private Long n_survey_id_eq;//[面试表单]
+	public void setN_survey_id_eq(Long n_survey_id_eq) {
+        this.n_survey_id_eq = n_survey_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_survey_id_eq)){
+            this.getSearchCond().eq("survey_id", n_survey_id_eq);
+        }
+    }
+	private String n_survey_title_eq;//[面试表单]
+	public void setN_survey_title_eq(String n_survey_title_eq) {
+        this.n_survey_title_eq = n_survey_title_eq;
+        if(!ObjectUtils.isEmpty(this.n_survey_title_eq)){
+            this.getSearchCond().eq("survey_title", n_survey_title_eq);
+        }
+    }
+	private String n_survey_title_like;//[面试表单]
+	public void setN_survey_title_like(String n_survey_title_like) {
+        this.n_survey_title_like = n_survey_title_like;
+        if(!ObjectUtils.isEmpty(this.n_survey_title_like)){
+            this.getSearchCond().like("survey_title", n_survey_title_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

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

@@ -62,6 +62,8 @@ public interface Hr_jobMapper extends BaseMapper<Hr_job>{
     @Delete("${sql}")
     boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
 
+    List<Hr_job> selectBySurveyId(@Param("id") Serializable id) ;
+
     List<Hr_job> selectByDepartmentId(@Param("id") Serializable id) ;
 
     List<Hr_job> selectByManagerId(@Param("id") Serializable id) ;

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

@@ -37,6 +37,8 @@ public interface IHr_jobService extends IService<Hr_job>{
     boolean save(Hr_job et) ;
     void saveBatch(List<Hr_job> list) ;
     Page<Hr_job> searchDefault(Hr_jobSearchContext context) ;
+    List<Hr_job> selectBySurveyId(Long id);
+    void removeBySurveyId(Long id);
     List<Hr_job> selectByDepartmentId(Long id);
     void resetByDepartmentId(Long id);
     void resetByDepartmentId(Collection<Long> ids);

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

@@ -68,6 +68,9 @@ public class Hr_jobServiceImpl extends EBSServiceImpl<Hr_jobMapper, Hr_job> impl
     protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_recruitment_stageService hrRecruitmentStageService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_survey.service.ISurvey_surveyService surveySurveyService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_departmentService hrDepartmentService;
     @Autowired
     @Lazy
@@ -229,6 +232,15 @@ public class Hr_jobServiceImpl extends EBSServiceImpl<Hr_jobMapper, Hr_job> impl
     }
 
 
+	@Override
+    public List<Hr_job> selectBySurveyId(Long id) {
+        return baseMapper.selectBySurveyId(id);
+    }
+    @Override
+    public void removeBySurveyId(Long id) {
+        this.remove(new QueryWrapper<Hr_job>().eq("survey_id",id));
+    }
+
 	@Override
     public List<Hr_job> selectByDepartmentId(Long id) {
         return baseMapper.selectByDepartmentId(id);
@@ -392,6 +404,16 @@ public class Hr_jobServiceImpl extends EBSServiceImpl<Hr_jobMapper, Hr_job> impl
      * @param et
      */
     private void fillParentData(Hr_job et){
+        //实体关系[DER1N_HR_JOB_SURVEY_SURVEY_SURVEY_ID]
+        if(!ObjectUtils.isEmpty(et.getSurveyId())){
+            cn.ibizlab.businesscentral.core.odoo_survey.domain.Survey_survey odooSurvey=et.getOdooSurvey();
+            if(ObjectUtils.isEmpty(odooSurvey)){
+                cn.ibizlab.businesscentral.core.odoo_survey.domain.Survey_survey majorEntity=surveySurveyService.get(et.getSurveyId());
+                et.setOdooSurvey(majorEntity);
+                odooSurvey=majorEntity;
+            }
+            et.setSurveyTitle(odooSurvey.getTitle());
+        }
         //实体关系[DER1N_HR_JOB__HR_DEPARTMENT__DEPARTMENT_ID]
         if(!ObjectUtils.isEmpty(et.getDepartmentId())){
             cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_department odooDepartment=et.getOdooDepartment();

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/domain/Product_supplierinfo.java

@@ -215,7 +215,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -433,14 +433,6 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
         this.modify("product_tmpl_id",productTmplId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [产品变体]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/domain/Product_template.java

@@ -1179,7 +1179,7 @@ public class Product_template extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -1691,14 +1691,6 @@ public class Product_template extends EntityMP implements Serializable {
         this.modify("description_sale",descriptionSale);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [产品种类]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/domain/Purchase_order_line.java

@@ -316,7 +316,7 @@ public class Purchase_order_line extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -621,14 +621,6 @@ public class Purchase_order_line extends EntityMP implements Serializable {
         this.modify("qty_invoiced",qtyInvoiced);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [分析账户]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/domain/Purchase_requisition.java

@@ -220,7 +220,7 @@ public class Purchase_requisition extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -492,14 +492,6 @@ public class Purchase_requisition extends EntityMP implements Serializable {
         this.modify("user_id",userId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [ID]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/domain/Purchase_requisition_line.java

@@ -158,7 +158,7 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -399,14 +399,6 @@ public class Purchase_requisition_line extends EntityMP implements Serializable
         this.modify("requisition_id",requisitionId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [说明]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/IPurchase_requisitionService.java

@@ -76,6 +76,8 @@ public interface IPurchase_requisitionService extends IService<Purchase_requisit
      */
     boolean execute(String sql, Map param);
 
+    List<Purchase_requisition> getPurchaseRequisitionByIds(List<Long> ids) ;
+    List<Purchase_requisition> getPurchaseRequisitionByEntities(List<Purchase_requisition> entities) ;
 }
 
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/IPurchase_requisition_lineService.java

@@ -69,6 +69,8 @@ public interface IPurchase_requisition_lineService extends IService<Purchase_req
      */
     boolean execute(String sql, Map param);
 
+    List<Purchase_requisition_line> getPurchaseRequisitionLineByIds(List<Long> ids) ;
+    List<Purchase_requisition_line> getPurchaseRequisitionLineByEntities(List<Purchase_requisition_line> entities) ;
 }
 
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/impl/Purchase_requisitionServiceImpl.java

@@ -458,6 +458,25 @@ public class Purchase_requisitionServiceImpl extends EBSServiceImpl<Purchase_req
         return true;
     }
 
+    @Override
+    public List<Purchase_requisition> getPurchaseRequisitionByIds(List<Long> ids) {
+         return this.listByIds(ids);
+    }
+
+    @Override
+    public List<Purchase_requisition> getPurchaseRequisitionByEntities(List<Purchase_requisition> entities) {
+        List ids =new ArrayList();
+        for(Purchase_requisition entity : entities){
+            Serializable id=entity.getId();
+            if(!ObjectUtils.isEmpty(id)){
+                ids.add(id);
+            }
+        }
+        if(ids.size()>0)
+           return this.listByIds(ids);
+        else
+           return entities;
+    }
 
 
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/impl/Purchase_requisition_lineServiceImpl.java

@@ -418,6 +418,25 @@ public class Purchase_requisition_lineServiceImpl extends EBSServiceImpl<Purchas
         return true;
     }
 
+    @Override
+    public List<Purchase_requisition_line> getPurchaseRequisitionLineByIds(List<Long> ids) {
+         return this.listByIds(ids);
+    }
+
+    @Override
+    public List<Purchase_requisition_line> getPurchaseRequisitionLineByEntities(List<Purchase_requisition_line> entities) {
+        List ids =new ArrayList();
+        for(Purchase_requisition_line entity : entities){
+            Serializable id=entity.getId();
+            if(!ObjectUtils.isEmpty(id)){
+                ids.add(id);
+            }
+        }
+        if(ids.size()>0)
+           return this.listByIds(ids);
+        else
+           return entities;
+    }
 
 
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/domain/Stock_location.java

@@ -256,7 +256,7 @@ public class Stock_location extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -432,14 +432,6 @@ public class Stock_location extends EntityMP implements Serializable {
         this.modify("valuation_in_account_id",valuationInAccountId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [库存计价科目（出向）]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/domain/Stock_move.java

@@ -877,7 +877,7 @@ public class Stock_move extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -1529,14 +1529,6 @@ public class Stock_move extends EntityMP implements Serializable {
         this.modify("location_id",locationId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/domain/Stock_picking.java

@@ -604,7 +604,7 @@ public class Stock_picking extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -898,14 +898,6 @@ public class Stock_picking extends EntityMP implements Serializable {
         this.modify("owner_id",ownerId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [源位置]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/domain/Stock_warehouse.java

@@ -539,7 +539,7 @@ public class Stock_warehouse extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -1051,14 +1051,6 @@ public class Stock_warehouse extends EntityMP implements Serializable {
         this.modify("partner_id",partnerId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [收货路线]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_survey/filter/Survey_surveySearchContext.java

@@ -134,7 +134,7 @@ public class Survey_surveySearchContext extends QueryWrapperContext<Survey_surve
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
             this.getSearchCond().and( wrapper ->
-                     wrapper.like("id", query)   
+                     wrapper.like("title", query)   
             );
 		 }
 	}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_survey/service/impl/Survey_surveyServiceImpl.java

@@ -51,6 +51,9 @@ import org.springframework.util.StringUtils;
 @Service("Survey_surveyServiceImpl")
 public class Survey_surveyServiceImpl extends EBSServiceImpl<Survey_surveyMapper, Survey_survey> implements ISurvey_surveyService {
 
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_jobService hrJobService;
     @Autowired
     @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_survey.service.ISurvey_mail_compose_messageService surveyMailComposeMessageService;

businesscentral-core/src/main/resources/mapper/odoo_base/res_users/Res_usersMapper.xml

@@ -219,6 +219,15 @@
 			 where  write_uid=#{id}
      </select>
 
+    <!--数据集合[Active]-->
+	 <select id="searchActive"  parameterType="cn.ibizlab.businesscentral.core.odoo_base.filter.Res_usersSearchContext"  resultMap="Res_usersResultMap">
+         select t1.* from (
+                <include refid="Active" />
+         )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]-->
 	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.odoo_base.filter.Res_usersSearchContext"  resultMap="Res_usersResultMap">
          select t1.* from (
@@ -228,6 +237,12 @@
          <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
      </select>
 
+    <!--数据查询[Active]-->
+    <sql id="Active" databaseId="postgresql">
+		<![CDATA[ SELECT t1.ACTION_ID, t1.ACTIVE, t11.ACTIVE AS ACTIVE_PARTNER, t11.ADDITIONAL_INFO, t101.ALIAS_CONTACT, t1.ALIAS_ID, t11.BARCODE, t11.CALENDAR_LAST_NOTIF_ACK, t11.CITY, t11.COLOR, t11.COMMERCIAL_COMPANY_NAME, t11.COMMERCIAL_PARTNER_ID, t1.COMPANY_ID, t91.NAME AS COMPANY_ID_TEXT, t11.COMPANY_NAME, t11.COUNTRY_ID, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t11.CREDIT_LIMIT, t11.DATE, t11.DEBIT_LIMIT, t11.EMAIL, t11.EMPLOYEE, t11.FUNCTION, t1.ID, t11.INDUSTRY_ID, t11.INVOICE_WARN, t11.IS_COMPANY, t11.IS_PUBLISHED, t1.KARMA, t11.LANG, t11.LAST_TIME_ENTRIES_CHECKED, t1.LOGIN, t11.MESSAGE_BOUNCE, t11.MESSAGE_MAIN_ATTACHMENT_ID, t11.MOBILE, t11.NAME, t1.NOTIFICATION_TYPE, t1.ODOOBOT_STATE, t11.PARENT_ID, t21.NAME AS PARENT_NAME, t11.PARTNER_GID, t1.PARTNER_ID, t11.PARTNER_SHARE, t11.PHONE, t11.PICKING_WARN, t11.PURCHASE_WARN, t11.REF, t1.SALE_TEAM_ID, t31.NAME AS SALE_TEAM_ID_TEXT, t11.SALE_WARN, t1.SHARE, t11.SIGNUP_EXPIRATION, t11.SIGNUP_TOKEN, t11.SIGNUP_TYPE, t11.STATE_ID, t11.STREET, t11.STREET2, t1.TARGET_SALES_DONE, t1.TARGET_SALES_INVOICED, t1.TARGET_SALES_WON, t11.TEAM_ID, t11.TITLE, t11.TYPE, t11.TZ, t11.USER_ID, t11.VAT, t11.WEBSITE, t1.WEBSITE_ID, t11.WEBSITE_META_KEYWORDS, t11.WEBSITE_META_OG_IMG, t11.WEBSITE_META_TITLE, t1.WRITE_DATE, t1.WRITE_UID, t51.NAME AS WRITE_UID_TEXT, t11.ZIP FROM RES_USERS t1  LEFT JOIN RES_PARTNER t11 ON t1.PARTNER_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARENT_ID = t21.ID  LEFT JOIN CRM_TEAM t31 ON t1.SALE_TEAM_ID = t31.ID  LEFT JOIN RES_USERS t41 ON t1.WRITE_UID = t41.ID  LEFT JOIN RES_PARTNER t51 ON t41.PARTNER_ID = t51.ID  LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID  LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_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  LEFT JOIN MAIL_ALIAS t101 ON t1.ALIAS_ID = t101.ID  
+					 WHERE 	( t1.ACTIVE = true )
+			]]>
+    </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
 		<![CDATA[ SELECT t1.ACTION_ID, t1.ACTIVE, t11.ACTIVE AS ACTIVE_PARTNER, t11.ADDITIONAL_INFO, t101.ALIAS_CONTACT, t1.ALIAS_ID, t11.BARCODE, t11.CALENDAR_LAST_NOTIF_ACK, t11.CITY, t11.COLOR, t11.COMMERCIAL_COMPANY_NAME, t11.COMMERCIAL_PARTNER_ID, t1.COMPANY_ID, t91.NAME AS COMPANY_ID_TEXT, t11.COMPANY_NAME, t11.COUNTRY_ID, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t11.CREDIT_LIMIT, t11.DATE, t11.DEBIT_LIMIT, t11.EMAIL, t11.EMPLOYEE, t11.FUNCTION, t1.ID, t11.INDUSTRY_ID, t11.INVOICE_WARN, t11.IS_COMPANY, t11.IS_PUBLISHED, t1.KARMA, t11.LANG, t11.LAST_TIME_ENTRIES_CHECKED, t1.LOGIN, t11.MESSAGE_BOUNCE, t11.MESSAGE_MAIN_ATTACHMENT_ID, t11.MOBILE, t11.NAME, t1.NOTIFICATION_TYPE, t1.ODOOBOT_STATE, t11.PARENT_ID, t21.NAME AS PARENT_NAME, t11.PARTNER_GID, t1.PARTNER_ID, t11.PARTNER_SHARE, t11.PHONE, t11.PICKING_WARN, t11.PURCHASE_WARN, t11.REF, t1.SALE_TEAM_ID, t31.NAME AS SALE_TEAM_ID_TEXT, t11.SALE_WARN, t1.SHARE, t11.SIGNUP_EXPIRATION, t11.SIGNUP_TOKEN, t11.SIGNUP_TYPE, t11.STATE_ID, t11.STREET, t11.STREET2, t1.TARGET_SALES_DONE, t1.TARGET_SALES_INVOICED, t1.TARGET_SALES_WON, t11.TEAM_ID, t11.TITLE, t11.TYPE, t11.TZ, t11.USER_ID, t11.VAT, t11.WEBSITE, t1.WEBSITE_ID, t11.WEBSITE_META_KEYWORDS, t11.WEBSITE_META_OG_IMG, t11.WEBSITE_META_TITLE, t1.WRITE_DATE, t1.WRITE_UID, t51.NAME AS WRITE_UID_TEXT, t11.ZIP FROM RES_USERS t1  LEFT JOIN RES_PARTNER t11 ON t1.PARTNER_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARENT_ID = t21.ID  LEFT JOIN CRM_TEAM t31 ON t1.SALE_TEAM_ID = t31.ID  LEFT JOIN RES_USERS t41 ON t1.WRITE_UID = t41.ID  LEFT JOIN RES_PARTNER t51 ON t41.PARTNER_ID = t51.ID  LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID  LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_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  LEFT JOIN MAIL_ALIAS t101 ON t1.ALIAS_ID = t101.ID  

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

@@ -830,6 +830,7 @@
     "nullable":0,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -27882,6 +27883,7 @@
     "nullable":0,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -70955,6 +70957,41 @@
     "key_field":0,
     "show_order":1000,
     "major_field":0
+    },
+    {
+    "fieldname":"SURVEY_ID" ,
+    "codename":"Survey_id",
+    "field_logic_name":"面试表单",
+    "entity_name":"Hr_job",
+    "ref_de":"SURVEY_SURVEY",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_HR_JOB_SURVEY_SURVEY_SURVEY_ID",
+    "relation_codename":"Odoo_survey",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
+    },
+    {
+    "fieldname":"SURVEY_TITLE" ,
+    "codename":"Survey_title",
+    "field_logic_name":"面试表单",
+    "entity_name":"Hr_job",
+    "ref_de":"SURVEY_SURVEY",
+    "ref_field_name":"TITLE",
+    "relation_name":"DER1N_HR_JOB_SURVEY_SURVEY_SURVEY_ID",
+    "relation_codename":"Odoo_survey",
+    "field_type":"PICKUPTEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
     }
     ],
     "subEntitys":[
@@ -70990,6 +71027,12 @@
     }
     ],
     "parentEntitys":[
+    {"name":"DER1N_HR_JOB_SURVEY_SURVEY_SURVEY_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_survey",
+     "entity_name":"HR_JOB",
+     "ref_entity_name":"SURVEY_SURVEY"
+    },
     {"name":"DER1N_HR_JOB__HR_DEPARTMENT__DEPARTMENT_ID",
      "relation_type":"DER1N",
      "code_name":"Odoo_department",
@@ -122081,6 +122124,7 @@
     "nullable":1,
     "physical_field":0,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -125547,6 +125591,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -127970,6 +128015,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -134194,6 +134240,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -135646,6 +135693,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -136051,6 +136099,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -146351,6 +146400,21 @@
     "key_field":0,
     "show_order":1000,
     "major_field":0
+    },
+    {
+    "fieldname":"MODULE_HR_SKILLS" ,
+    "codename":"Module_hr_skills",
+    "field_logic_name":"技能管理",
+    "entity_name":"Res_config_settings",
+    "field_type":"TRUEFALSE",
+    "dict":"Odoo_truefalse",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIT",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
     }
     ],
     "subEntitys":[
@@ -153715,6 +153779,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -174460,6 +174525,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -177110,6 +177176,7 @@
     "nullable":0,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -180451,6 +180518,7 @@
     "nullable":0,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -187467,6 +187535,7 @@
     "nullable":0,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -192001,7 +192070,7 @@
     "data_type":"BIGINT",
     "key_field":1,
     "show_order":1000,
-    "major_field":1
+    "major_field":0
     },
     {
     "fieldname":"TOT_START_SURVEY" ,
@@ -192382,7 +192451,7 @@
     "data_length":100,
     "key_field":0,
     "show_order":1000,
-    "major_field":0
+    "major_field":1
     },
     {
     "fieldname":"THANK_YOU_MESSAGE" ,
@@ -192615,6 +192684,12 @@
     }
     ],
     "subEntitys":[
+    {"name":"DER1N_HR_JOB_SURVEY_SURVEY_SURVEY_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_survey",
+     "entity_name":"HR_JOB",
+     "ref_entity_name":"SURVEY_SURVEY"
+    },
     {"name":"DER1N_SURVEY_MAIL_COMPOSE_MESSAGE__SURVEY_SURVEY__SURVEY_ID",
      "relation_type":"DER1N",
      "code_name":"Odoo_survey",

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

@@ -232,7 +232,6 @@ public class Account_accountDTO extends DTOBase implements Serializable {
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "[公司]不允许为空!")
     private Long companyId;
 
     /**
@@ -322,14 +321,6 @@ public class Account_accountDTO extends DTOBase implements Serializable {
         this.modify("name",name);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [GROUP_ID]
      */

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

@@ -287,7 +287,6 @@ public class Account_taxDTO extends DTOBase implements Serializable {
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "[公司]不允许为空!")
     private Long companyId;
 
 
@@ -395,14 +394,6 @@ public class Account_taxDTO extends DTOBase implements Serializable {
         this.modify("tax_group_id",taxGroupId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
 
 }
 

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

@@ -632,6 +632,24 @@ public class Hr_jobDTO extends DTOBase implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
+    /**
+     * 属性 [SURVEY_ID]
+     *
+     */
+    @JSONField(name = "survey_id")
+    @JsonProperty("survey_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long surveyId;
+
+    /**
+     * 属性 [SURVEY_TITLE]
+     *
+     */
+    @JSONField(name = "survey_title")
+    @JsonProperty("survey_title")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String surveyTitle;
+
 
     /**
      * 设置 [NO_OF_EMPLOYEE]
@@ -825,6 +843,14 @@ public class Hr_jobDTO extends DTOBase implements Serializable {
         this.modify("user_id",userId);
     }
 
+    /**
+     * 设置 [SURVEY_ID]
+     */
+    public void setSurveyId(Long  surveyId){
+        this.surveyId = surveyId ;
+        this.modify("survey_id",surveyId);
+    }
+
 
 }
 

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

@@ -371,14 +371,6 @@ public class Product_supplierinfoDTO extends DTOBase implements Serializable {
         this.modify("product_tmpl_id",productTmplId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [PRODUCT_ID]
      */

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

@@ -1825,14 +1825,6 @@ public class Product_templateDTO extends DTOBase implements Serializable {
         this.modify("description_sale",descriptionSale);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [CATEG_ID]
      */

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

@@ -563,14 +563,6 @@ public class Purchase_order_lineDTO extends DTOBase implements Serializable {
         this.modify("qty_invoiced",qtyInvoiced);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [ACCOUNT_ANALYTIC_ID]
      */

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

@@ -386,14 +386,6 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
         this.modify("user_id",userId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [CURRENCY_ID]
      */

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

@@ -315,14 +315,6 @@ public class Purchase_requisition_lineDTO extends DTOBase implements Serializabl
         this.modify("requisition_id",requisitionId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [MOVE_DEST_ID]
      */

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

@@ -1977,6 +1977,14 @@ public class Res_config_settingsDTO extends DTOBase implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long writeUid;
 
+    /**
+     * 属性 [MODULE_HR_SKILLS]
+     *
+     */
+    @JSONField(name = "module_hr_skills")
+    @JsonProperty("module_hr_skills")
+    private Boolean moduleHrSkills;
+
 
     /**
      * 设置 [MODULE_ACCOUNT_BANK_STATEMENT_IMPORT_QIF]
@@ -3170,6 +3178,14 @@ public class Res_config_settingsDTO extends DTOBase implements Serializable {
         this.modify("auth_signup_template_user_id",authSignupTemplateUserId);
     }
 
+    /**
+     * 设置 [MODULE_HR_SKILLS]
+     */
+    public void setModuleHrSkills(Boolean  moduleHrSkills){
+        this.moduleHrSkills = moduleHrSkills ;
+        this.modify("module_hr_skills",moduleHrSkills);
+    }
+
 
 }
 

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

@@ -495,14 +495,6 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
         this.modify("title",title);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [COUNTRY_ID]
      */

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

@@ -409,14 +409,6 @@ public class Stock_locationDTO extends DTOBase implements Serializable {
         this.modify("valuation_in_account_id",valuationInAccountId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [VALUATION_OUT_ACCOUNT_ID]
      */

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

@@ -1026,7 +1026,6 @@ public class Stock_moveDTO extends DTOBase implements Serializable {
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "[公司]不允许为空!")
     private Long companyId;
 
     /**
@@ -1423,14 +1422,6 @@ public class Stock_moveDTO extends DTOBase implements Serializable {
         this.modify("location_id",locationId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
 
 }
 

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

@@ -695,7 +695,6 @@ public class Stock_pickingDTO extends DTOBase implements Serializable {
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "[公司]不允许为空!")
     private Long companyId;
 
     /**
@@ -878,14 +877,6 @@ public class Stock_pickingDTO extends DTOBase implements Serializable {
         this.modify("owner_id",ownerId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [LOCATION_ID]
      */

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

@@ -631,7 +631,6 @@ public class Stock_warehouseDTO extends DTOBase implements Serializable {
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "[公司]不允许为空!")
     private Long companyId;
 
     /**
@@ -917,14 +916,6 @@ public class Stock_warehouseDTO extends DTOBase implements Serializable {
         this.modify("partner_id",partnerId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [RECEPTION_ROUTE_ID]
      */

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

@@ -115,6 +115,17 @@ public class Account_taxResource {
         return ResponseEntity.status(HttpStatus.OK).body(account_taxMapping.toDto(account_taxService.getDraft(new Account_tax())));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Account_tax-Calc_tax-all')")
+    @ApiOperation(value = "calc_tax", tags = {"税率" },  notes = "calc_tax")
+	@RequestMapping(method = RequestMethod.POST, value = "/account_taxes/{account_tax_id}/calc_tax")
+    public ResponseEntity<Account_taxDTO> calc_tax(@PathVariable("account_tax_id") Long account_tax_id, @RequestBody Account_taxDTO account_taxdto) {
+        Account_tax domain = account_taxMapping.toDomain(account_taxdto);
+        domain.setId(account_tax_id);
+        domain = account_taxService.calc_tax(domain);
+        account_taxdto = account_taxMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(account_taxdto);
+    }
+
     @ApiOperation(value = "检查税率", tags = {"税率" },  notes = "检查税率")
 	@RequestMapping(method = RequestMethod.POST, value = "/account_taxes/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody Account_taxDTO account_taxdto) {

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

@@ -121,6 +121,17 @@ public class Res_config_settingsResource {
         return  ResponseEntity.status(HttpStatus.OK).body(res_config_settingsService.checkKey(res_config_settingsMapping.toDomain(res_config_settingsdto)));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_config_settings-GetLatestSettings-all')")
+    @ApiOperation(value = "获取设置", tags = {"配置设定" },  notes = "获取设置")
+	@RequestMapping(method = RequestMethod.GET, value = "/res_config_settings/{res_config_settings_id}/getlatestsettings")
+    public ResponseEntity<Res_config_settingsDTO> getLatestSettings(@PathVariable("res_config_settings_id") Long res_config_settings_id, @RequestBody Res_config_settingsDTO res_config_settingsdto) {
+        Res_config_settings domain = res_config_settingsMapping.toDomain(res_config_settingsdto);
+        domain.setId(res_config_settings_id);
+        domain = res_config_settingsService.getLatestSettings(domain);
+        res_config_settingsdto = res_config_settingsMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(res_config_settingsdto);
+    }
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_config_settings-Get_default-all')")
     @ApiOperation(value = "获取配置", tags = {"配置设定" },  notes = "获取配置")
 	@RequestMapping(method = RequestMethod.GET, value = "/res_config_settings/get_default")

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

@@ -47,7 +47,7 @@ public class Res_supplierResource {
     @Lazy
     public Res_supplierMapping res_supplierMapping;
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Create-all')")
+    @PreAuthorize("hasPermission(this.res_supplierMapping.toDomain(#res_supplierdto),'iBizBusinessCentral-Res_supplier-Create')")
     @ApiOperation(value = "新建供应商", tags = {"供应商" },  notes = "新建供应商")
 	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers")
     public ResponseEntity<Res_supplierDTO> create(@Validated @RequestBody Res_supplierDTO res_supplierdto) {
@@ -57,7 +57,7 @@ public class Res_supplierResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Create-all')")
+    @PreAuthorize("hasPermission(this.res_supplierMapping.toDomain(#res_supplierdtos),'iBizBusinessCentral-Res_supplier-Create')")
     @ApiOperation(value = "批量新建供应商", tags = {"供应商" },  notes = "批量新建供应商")
 	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<Res_supplierDTO> res_supplierdtos) {
@@ -65,7 +65,7 @@ public class Res_supplierResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Update-all')")
+    @PreAuthorize("hasPermission(this.res_supplierService.get(#res_supplier_id),'iBizBusinessCentral-Res_supplier-Update')")
     @ApiOperation(value = "更新供应商", tags = {"供应商" },  notes = "更新供应商")
 	@RequestMapping(method = RequestMethod.PUT, value = "/res_suppliers/{res_supplier_id}")
     public ResponseEntity<Res_supplierDTO> update(@PathVariable("res_supplier_id") Long res_supplier_id, @RequestBody Res_supplierDTO res_supplierdto) {
@@ -76,7 +76,7 @@ public class Res_supplierResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Update-all')")
+    @PreAuthorize("hasPermission(this.res_supplierService.getResSupplierByEntities(this.res_supplierMapping.toDomain(#res_supplierdtos)),'iBizBusinessCentral-Res_supplier-Update')")
     @ApiOperation(value = "批量更新供应商", tags = {"供应商" },  notes = "批量更新供应商")
 	@RequestMapping(method = RequestMethod.PUT, value = "/res_suppliers/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<Res_supplierDTO> res_supplierdtos) {
@@ -84,14 +84,14 @@ public class Res_supplierResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Remove-all')")
+    @PreAuthorize("hasPermission(this.res_supplierService.get(#res_supplier_id),'iBizBusinessCentral-Res_supplier-Remove')")
     @ApiOperation(value = "删除供应商", tags = {"供应商" },  notes = "删除供应商")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/res_suppliers/{res_supplier_id}")
     public ResponseEntity<Boolean> remove(@PathVariable("res_supplier_id") Long res_supplier_id) {
          return ResponseEntity.status(HttpStatus.OK).body(res_supplierService.remove(res_supplier_id));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Remove-all')")
+    @PreAuthorize("hasPermission(this.res_supplierService.getResSupplierByIds(#ids),'iBizBusinessCentral-Res_supplier-Remove')")
     @ApiOperation(value = "批量删除供应商", tags = {"供应商" },  notes = "批量删除供应商")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/res_suppliers/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<Long> ids) {
@@ -99,7 +99,7 @@ public class Res_supplierResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Get-all')")
+    @PostAuthorize("hasPermission(this.res_supplierMapping.toDomain(returnObject.body),'iBizBusinessCentral-Res_supplier-Get')")
     @ApiOperation(value = "获取供应商", tags = {"供应商" },  notes = "获取供应商")
 	@RequestMapping(method = RequestMethod.GET, value = "/res_suppliers/{res_supplier_id}")
     public ResponseEntity<Res_supplierDTO> get(@PathVariable("res_supplier_id") Long res_supplier_id) {
@@ -131,14 +131,14 @@ public class Res_supplierResource {
         return ResponseEntity.status(HttpStatus.OK).body(res_supplierdto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Save-all')")
+    @PreAuthorize("hasPermission(this.res_supplierMapping.toDomain(#res_supplierdto),'iBizBusinessCentral-Res_supplier-Save')")
     @ApiOperation(value = "保存供应商", tags = {"供应商" },  notes = "保存供应商")
 	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/save")
     public ResponseEntity<Boolean> save(@RequestBody Res_supplierDTO res_supplierdto) {
         return ResponseEntity.status(HttpStatus.OK).body(res_supplierService.save(res_supplierMapping.toDomain(res_supplierdto)));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Save-all')")
+    @PreAuthorize("hasPermission(this.res_supplierMapping.toDomain(#res_supplierdtos),'iBizBusinessCentral-Res_supplier-Save')")
     @ApiOperation(value = "批量保存供应商", tags = {"供应商" },  notes = "批量保存供应商")
 	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<Res_supplierDTO> res_supplierdtos) {
@@ -146,7 +146,7 @@ public class Res_supplierResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-searchDefault-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Res_supplier-Get')")
 	@ApiOperation(value = "获取数据集", tags = {"供应商" } ,notes = "获取数据集")
     @RequestMapping(method= RequestMethod.GET , value="/res_suppliers/fetchdefault")
 	public ResponseEntity<List<Res_supplierDTO>> fetchDefault(Res_supplierSearchContext context) {
@@ -159,7 +159,7 @@ public class Res_supplierResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-searchDefault-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Res_supplier-Get')")
 	@ApiOperation(value = "查询数据集", tags = {"供应商" } ,notes = "查询数据集")
     @RequestMapping(method= RequestMethod.POST , value="/res_suppliers/searchdefault")
 	public ResponseEntity<Page<Res_supplierDTO>> searchDefault(@RequestBody Res_supplierSearchContext context) {

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

@@ -147,6 +147,28 @@ public class Res_usersResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_users-searchActive-all') and hasPermission(#context,'iBizBusinessCentral-Res_users-Get')")
+	@ApiOperation(value = "获取有效用户", tags = {"用户" } ,notes = "获取有效用户")
+    @RequestMapping(method= RequestMethod.GET , value="/res_users/fetchactive")
+	public ResponseEntity<List<Res_usersDTO>> fetchActive(Res_usersSearchContext context) {
+        Page<Res_users> domains = res_usersService.searchActive(context) ;
+        List<Res_usersDTO> list = res_usersMapping.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_users-searchActive-all') and hasPermission(#context,'iBizBusinessCentral-Res_users-Get')")
+	@ApiOperation(value = "查询有效用户", tags = {"用户" } ,notes = "查询有效用户")
+    @RequestMapping(method= RequestMethod.POST , value="/res_users/searchactive")
+	public ResponseEntity<Page<Res_usersDTO>> searchActive(@RequestBody Res_usersSearchContext context) {
+        Page<Res_users> domains = res_usersService.searchActive(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(res_usersMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_users-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Res_users-Get')")
 	@ApiOperation(value = "获取数据集", tags = {"用户" } ,notes = "获取数据集")
     @RequestMapping(method= RequestMethod.GET , value="/res_users/fetchdefault")