Skip to content

I
iBiz商业中心
提交 b27861ad 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

xignzi006 发布系统代码 [Spring Boot]

上级 7b3747cd
隐藏空白字符变更
内嵌 并排
正在显示 包含 203 行增加 和 57 行删除
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/domain/Account_journal.java
浏览文件 @ b27861ad
......@@ -234,14 +234,6 @@ public class Account_journal extends EntityMP implements Serializable {
@JSONField(name = "update_posted")
@JsonProperty("update_posted")
private Boolean updatePosted;
/**
* 授权差异的总金额
*/
@DEField(name = "amount_authorized_diff")
@TableField(value = "amount_authorized_diff")
@JSONField(name = "amount_authorized_diff")
@JsonProperty("amount_authorized_diff")
private Double amountAuthorizedDiff;
/**
* 看板仪表板图表
*/
......@@ -643,14 +635,6 @@ public class Account_journal extends EntityMP implements Serializable {
this.modify("update_posted",updatePosted);
}
/**
* 设置 [授权差异的总金额]
*/
public void setAmountAuthorizedDiff(Double amountAuthorizedDiff){
this.amountAuthorizedDiff = amountAuthorizedDiff ;
this.modify("amount_authorized_diff",amountAuthorizedDiff);
}
/**
* 设置 [类型]
*/
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_usersServiceImpl.java
浏览文件 @ b27861ad
......@@ -479,10 +479,10 @@ public class Res_usersServiceImpl extends EBSServiceImpl<Res_usersMapper, Res_us
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_attendanceService hrAttendanceService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_contract_typeService hrContractTypeService;
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_contractService hrContractService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_contractService hrContractService;
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_contract_typeService hrContractTypeService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_departmentService hrDepartmentService;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/domain/Hr_contract.java
浏览文件 @ b27861ad
......@@ -429,6 +429,29 @@ public class Hr_contract extends EntityMP implements Serializable {
@JSONField(name = "department_id")
@JsonProperty("department_id")
private Long departmentId;
/**
* 人力资源主管
*/
@DEField(name = "hr_responsible_id")
@TableField(value = "hr_responsible_id")
@JSONField(name = "hr_responsible_id")
@JsonProperty("hr_responsible_id")
private Long hrResponsibleId;
/**
* 人力资源主管
*/
@TableField(exist = false)
@JSONField(name = "hr_responsible_name")
@JsonProperty("hr_responsible_name")
private String hrResponsibleName;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooHrResponsible;
/**
*
......@@ -638,6 +661,14 @@ public class Hr_contract extends EntityMP implements Serializable {
this.modify("department_id",departmentId);
}
/**
* 设置 [人力资源主管]
*/
public void setHrResponsibleId(Long hrResponsibleId){
this.hrResponsibleId = hrResponsibleId ;
this.modify("hr_responsible_id",hrResponsibleId);
}
@Override
public Serializable getDefaultKey(boolean gen) {
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/filter/Hr_contractSearchContext.java
浏览文件 @ b27861ad
......@@ -195,6 +195,27 @@ public class Hr_contractSearchContext extends QueryWrapperContext<Hr_contract> {
this.getSearchCond().eq("department_id", n_department_id_eq);
}
}
private Long n_hr_responsible_id_eq;//[人力资源主管]
public void setN_hr_responsible_id_eq(Long n_hr_responsible_id_eq) {
this.n_hr_responsible_id_eq = n_hr_responsible_id_eq;
if(!ObjectUtils.isEmpty(this.n_hr_responsible_id_eq)){
this.getSearchCond().eq("hr_responsible_id", n_hr_responsible_id_eq);
}
}
private String n_hr_responsible_name_eq;//[人力资源主管]
public void setN_hr_responsible_name_eq(String n_hr_responsible_name_eq) {
this.n_hr_responsible_name_eq = n_hr_responsible_name_eq;
if(!ObjectUtils.isEmpty(this.n_hr_responsible_name_eq)){
this.getSearchCond().eq("hr_responsible_name", n_hr_responsible_name_eq);
}
}
private String n_hr_responsible_name_like;//[人力资源主管]
public void setN_hr_responsible_name_like(String n_hr_responsible_name_like) {
this.n_hr_responsible_name_like = n_hr_responsible_name_like;
if(!ObjectUtils.isEmpty(this.n_hr_responsible_name_like)){
this.getSearchCond().like("hr_responsible_name", n_hr_responsible_name_like);
}
}
/**
* 启用快速搜索
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/mapper/Hr_contractMapper.java
浏览文件 @ b27861ad
......@@ -62,6 +62,8 @@ public interface Hr_contractMapper extends BaseMapper<Hr_contract>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<Hr_contract> selectByHrResponsibleId(@Param("id") Serializable id) ;
List<Hr_contract> selectByDepartmentId(@Param("id") Serializable id) ;
List<Hr_contract> selectByEmployeeId(@Param("id") Serializable id) ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/service/IHr_contractService.java
浏览文件 @ b27861ad
......@@ -37,6 +37,8 @@ public interface IHr_contractService extends IService<Hr_contract>{
boolean save(Hr_contract et) ;
void saveBatch(List<Hr_contract> list) ;
Page<Hr_contract> searchDefault(Hr_contractSearchContext context) ;
List<Hr_contract> selectByHrResponsibleId(Long id);
void removeByHrResponsibleId(Long id);
List<Hr_contract> 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_contractServiceImpl.java
浏览文件 @ b27861ad
......@@ -51,6 +51,9 @@ import org.springframework.util.StringUtils;
@Service("Hr_contractServiceImpl")
public class Hr_contractServiceImpl extends EBSServiceImpl<Hr_contractMapper, Hr_contract> implements IHr_contractService {
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_departmentService hrDepartmentService;
......@@ -66,9 +69,6 @@ public class Hr_contractServiceImpl extends EBSServiceImpl<Hr_contractMapper, Hr
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_companyService resCompanyService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
protected int batchSize = 500;
......@@ -207,6 +207,15 @@ public class Hr_contractServiceImpl extends EBSServiceImpl<Hr_contractMapper, Hr
}
@Override
public List<Hr_contract> selectByHrResponsibleId(Long id) {
return baseMapper.selectByHrResponsibleId(id);
}
@Override
public void removeByHrResponsibleId(Long id) {
this.remove(new QueryWrapper<Hr_contract>().eq("hr_responsible_id",id));
}
@Override
public List<Hr_contract> selectByDepartmentId(Long id) {
return baseMapper.selectByDepartmentId(id);
......@@ -337,6 +346,16 @@ public class Hr_contractServiceImpl extends EBSServiceImpl<Hr_contractMapper, Hr
* @param et
*/
private void fillParentData(Hr_contract et){
//实体关系[DER1N_HR_CONTRACT_RES_USERS_HR_RESPONSIBLE_ID]
if(!ObjectUtils.isEmpty(et.getHrResponsibleId())){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users odooHrResponsible=et.getOdooHrResponsible();
if(ObjectUtils.isEmpty(odooHrResponsible)){
cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users majorEntity=resUsersService.get(et.getHrResponsibleId());
et.setOdooHrResponsible(majorEntity);
odooHrResponsible=majorEntity;
}
et.setHrResponsibleName(odooHrResponsible.getName());
}
//实体关系[DER1N_HR_CONTRACT__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/resources/mapper/odoo_account/account_journal/Account_journalMapper.xml
浏览文件 @ b27861ad
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="Account_journalResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.ACTIVE, t1.ALIAS_ID, t41.ALIAS_NAME, t1.AMOUNT_AUTHORIZED_DIFF, t1.AT_LEAST_ONE_INBOUND, t1.AT_LEAST_ONE_OUTBOUND, t1.BANK_ACCOUNT_ID, t51.ACC_NUMBER AS BANK_ACC_NUMBER, t51.BANK_ID, t1.BANK_STATEMENTS_SOURCE, t1.CODE, t1.COLOR, t1.COMPANY_ID, t131.NAME AS COMPANY_ID_TEXT, t101.PARTNER_ID AS COMPANY_PARTNER_ID, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t1.CURRENCY_ID, t121.NAME AS CURRENCY_ID_TEXT, t1.DEFAULT_CREDIT_ACCOUNT_ID, t91.NAME AS DEFAULT_CREDIT_ACCOUNT_ID_TEXT, t1.DEFAULT_DEBIT_ACCOUNT_ID, t111.NAME AS DEFAULT_DEBIT_ACCOUNT_ID_TEXT, t1.GROUP_INVOICE_LINES, t1.ID, t1.JOURNAL_USER, t1.LOSS_ACCOUNT_ID, t81.NAME AS LOSS_ACCOUNT_ID_TEXT, t1.NAME, t1.POST_AT_BANK_REC, t1.PROFIT_ACCOUNT_ID, t31.NAME AS PROFIT_ACCOUNT_ID_TEXT, t1.REFUND_SEQUENCE, t1.REFUND_SEQUENCE_ID, t1.SEQUENCE, t1.SEQUENCE_ID, t1.SHOW_ON_DASHBOARD, t1.TYPE, t1.UPDATE_POSTED, t1.WRITE_DATE, t1.WRITE_UID, t71.NAME AS WRITE_UID_TEXT FROM ACCOUNT_JOURNAL t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN ACCOUNT_ACCOUNT t31 ON t1.PROFIT_ACCOUNT_ID = t31.ID LEFT JOIN MAIL_ALIAS t41 ON t1.ALIAS_ID = t41.ID LEFT JOIN RES_PARTNER_BANK t51 ON t1.BANK_ACCOUNT_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.WRITE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN ACCOUNT_ACCOUNT t81 ON t1.LOSS_ACCOUNT_ID = t81.ID LEFT JOIN ACCOUNT_ACCOUNT t91 ON t1.DEFAULT_CREDIT_ACCOUNT_ID = t91.ID LEFT JOIN RES_COMPANY t101 ON t1.COMPANY_ID = t101.ID LEFT JOIN ACCOUNT_ACCOUNT t111 ON t1.DEFAULT_DEBIT_ACCOUNT_ID = t111.ID LEFT JOIN RES_CURRENCY t121 ON t1.CURRENCY_ID = t121.ID LEFT JOIN RES_PARTNER t131 ON t101.PARTNER_ID = t131.ID ) t1 where id=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.ACTIVE, t1.ALIAS_ID, t41.ALIAS_NAME, t1.AT_LEAST_ONE_INBOUND, t1.AT_LEAST_ONE_OUTBOUND, t1.BANK_ACCOUNT_ID, t51.ACC_NUMBER AS BANK_ACC_NUMBER, t51.BANK_ID, t1.BANK_STATEMENTS_SOURCE, t1.CODE, t1.COLOR, t1.COMPANY_ID, t131.NAME AS COMPANY_ID_TEXT, t101.PARTNER_ID AS COMPANY_PARTNER_ID, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t1.CURRENCY_ID, t121.NAME AS CURRENCY_ID_TEXT, t1.DEFAULT_CREDIT_ACCOUNT_ID, t91.NAME AS DEFAULT_CREDIT_ACCOUNT_ID_TEXT, t1.DEFAULT_DEBIT_ACCOUNT_ID, t111.NAME AS DEFAULT_DEBIT_ACCOUNT_ID_TEXT, t1.GROUP_INVOICE_LINES, t1.ID, t1.JOURNAL_USER, t1.LOSS_ACCOUNT_ID, t81.NAME AS LOSS_ACCOUNT_ID_TEXT, t1.NAME, t1.POST_AT_BANK_REC, t1.PROFIT_ACCOUNT_ID, t31.NAME AS PROFIT_ACCOUNT_ID_TEXT, t1.REFUND_SEQUENCE, t1.REFUND_SEQUENCE_ID, t1.SEQUENCE, t1.SEQUENCE_ID, t1.SHOW_ON_DASHBOARD, t1.TYPE, t1.UPDATE_POSTED, t1.WRITE_DATE, t1.WRITE_UID, t71.NAME AS WRITE_UID_TEXT FROM ACCOUNT_JOURNAL t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN ACCOUNT_ACCOUNT t31 ON t1.PROFIT_ACCOUNT_ID = t31.ID LEFT JOIN MAIL_ALIAS t41 ON t1.ALIAS_ID = t41.ID LEFT JOIN RES_PARTNER_BANK t51 ON t1.BANK_ACCOUNT_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.WRITE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN ACCOUNT_ACCOUNT t81 ON t1.LOSS_ACCOUNT_ID = t81.ID LEFT JOIN ACCOUNT_ACCOUNT t91 ON t1.DEFAULT_CREDIT_ACCOUNT_ID = t91.ID LEFT JOIN RES_COMPANY t101 ON t1.COMPANY_ID = t101.ID LEFT JOIN ACCOUNT_ACCOUNT t111 ON t1.DEFAULT_DEBIT_ACCOUNT_ID = t111.ID LEFT JOIN RES_CURRENCY t121 ON t1.CURRENCY_ID = t121.ID LEFT JOIN RES_PARTNER t131 ON t101.PARTNER_ID = t131.ID ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -32,7 +32,6 @@
<result property="aliasDomain" column="alias_domain" />
<result property="accountControlIds" column="account_control_ids" />
<result property="updatePosted" column="update_posted" />
<result property="amountAuthorizedDiff" column="amount_authorized_diff" />
<result property="kanbanDashboardGraph" column="kanban_dashboard_graph" />
<result property="outboundPaymentMethodIds" column="outbound_payment_method_ids" />
<result property="kanbanDashboard" column="kanban_dashboard" />
......@@ -165,12 +164,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.ACTIVE, t1.ALIAS_ID, t41.ALIAS_NAME, t1.AMOUNT_AUTHORIZED_DIFF, t1.AT_LEAST_ONE_INBOUND, t1.AT_LEAST_ONE_OUTBOUND, t1.BANK_ACCOUNT_ID, t51.ACC_NUMBER AS BANK_ACC_NUMBER, t51.BANK_ID, t1.BANK_STATEMENTS_SOURCE, t1.CODE, t1.COLOR, t1.COMPANY_ID, t131.NAME AS COMPANY_ID_TEXT, t101.PARTNER_ID AS COMPANY_PARTNER_ID, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t1.CURRENCY_ID, t121.NAME AS CURRENCY_ID_TEXT, t1.DEFAULT_CREDIT_ACCOUNT_ID, t91.NAME AS DEFAULT_CREDIT_ACCOUNT_ID_TEXT, t1.DEFAULT_DEBIT_ACCOUNT_ID, t111.NAME AS DEFAULT_DEBIT_ACCOUNT_ID_TEXT, t1.GROUP_INVOICE_LINES, t1.ID, t1.JOURNAL_USER, t1.LOSS_ACCOUNT_ID, t81.NAME AS LOSS_ACCOUNT_ID_TEXT, t1.NAME, t1.POST_AT_BANK_REC, t1.PROFIT_ACCOUNT_ID, t31.NAME AS PROFIT_ACCOUNT_ID_TEXT, t1.REFUND_SEQUENCE, t1.REFUND_SEQUENCE_ID, t1.SEQUENCE, t1.SEQUENCE_ID, t1.SHOW_ON_DASHBOARD, t1.TYPE, t1.UPDATE_POSTED, t1.WRITE_DATE, t1.WRITE_UID, t71.NAME AS WRITE_UID_TEXT FROM ACCOUNT_JOURNAL t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN ACCOUNT_ACCOUNT t31 ON t1.PROFIT_ACCOUNT_ID = t31.ID LEFT JOIN MAIL_ALIAS t41 ON t1.ALIAS_ID = t41.ID LEFT JOIN RES_PARTNER_BANK t51 ON t1.BANK_ACCOUNT_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.WRITE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN ACCOUNT_ACCOUNT t81 ON t1.LOSS_ACCOUNT_ID = t81.ID LEFT JOIN ACCOUNT_ACCOUNT t91 ON t1.DEFAULT_CREDIT_ACCOUNT_ID = t91.ID LEFT JOIN RES_COMPANY t101 ON t1.COMPANY_ID = t101.ID LEFT JOIN ACCOUNT_ACCOUNT t111 ON t1.DEFAULT_DEBIT_ACCOUNT_ID = t111.ID LEFT JOIN RES_CURRENCY t121 ON t1.CURRENCY_ID = t121.ID LEFT JOIN RES_PARTNER t131 ON t101.PARTNER_ID = t131.ID
<![CDATA[ SELECT t1.ACTIVE, t1.ALIAS_ID, t41.ALIAS_NAME, t1.AT_LEAST_ONE_INBOUND, t1.AT_LEAST_ONE_OUTBOUND, t1.BANK_ACCOUNT_ID, t51.ACC_NUMBER AS BANK_ACC_NUMBER, t51.BANK_ID, t1.BANK_STATEMENTS_SOURCE, t1.CODE, t1.COLOR, t1.COMPANY_ID, t131.NAME AS COMPANY_ID_TEXT, t101.PARTNER_ID AS COMPANY_PARTNER_ID, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t1.CURRENCY_ID, t121.NAME AS CURRENCY_ID_TEXT, t1.DEFAULT_CREDIT_ACCOUNT_ID, t91.NAME AS DEFAULT_CREDIT_ACCOUNT_ID_TEXT, t1.DEFAULT_DEBIT_ACCOUNT_ID, t111.NAME AS DEFAULT_DEBIT_ACCOUNT_ID_TEXT, t1.GROUP_INVOICE_LINES, t1.ID, t1.JOURNAL_USER, t1.LOSS_ACCOUNT_ID, t81.NAME AS LOSS_ACCOUNT_ID_TEXT, t1.NAME, t1.POST_AT_BANK_REC, t1.PROFIT_ACCOUNT_ID, t31.NAME AS PROFIT_ACCOUNT_ID_TEXT, t1.REFUND_SEQUENCE, t1.REFUND_SEQUENCE_ID, t1.SEQUENCE, t1.SEQUENCE_ID, t1.SHOW_ON_DASHBOARD, t1.TYPE, t1.UPDATE_POSTED, t1.WRITE_DATE, t1.WRITE_UID, t71.NAME AS WRITE_UID_TEXT FROM ACCOUNT_JOURNAL t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN ACCOUNT_ACCOUNT t31 ON t1.PROFIT_ACCOUNT_ID = t31.ID LEFT JOIN MAIL_ALIAS t41 ON t1.ALIAS_ID = t41.ID LEFT JOIN RES_PARTNER_BANK t51 ON t1.BANK_ACCOUNT_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.WRITE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN ACCOUNT_ACCOUNT t81 ON t1.LOSS_ACCOUNT_ID = t81.ID LEFT JOIN ACCOUNT_ACCOUNT t91 ON t1.DEFAULT_CREDIT_ACCOUNT_ID = t91.ID LEFT JOIN RES_COMPANY t101 ON t1.COMPANY_ID = t101.ID LEFT JOIN ACCOUNT_ACCOUNT t111 ON t1.DEFAULT_DEBIT_ACCOUNT_ID = t111.ID LEFT JOIN RES_CURRENCY t121 ON t1.CURRENCY_ID = t121.ID LEFT JOIN RES_PARTNER t131 ON t101.PARTNER_ID = t131.ID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.ACTIVE, t1.ALIAS_ID, t41.ALIAS_NAME, t1.AMOUNT_AUTHORIZED_DIFF, t1.AT_LEAST_ONE_INBOUND, t1.AT_LEAST_ONE_OUTBOUND, t1.BANK_ACCOUNT_ID, t51.ACC_NUMBER AS BANK_ACC_NUMBER, t51.BANK_ID, t1.BANK_STATEMENTS_SOURCE, t1.CODE, t1.COLOR, t1.COMPANY_ID, t131.NAME AS COMPANY_ID_TEXT, t101.PARTNER_ID AS COMPANY_PARTNER_ID, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t1.CURRENCY_ID, t121.NAME AS CURRENCY_ID_TEXT, t1.DEFAULT_CREDIT_ACCOUNT_ID, t91.NAME AS DEFAULT_CREDIT_ACCOUNT_ID_TEXT, t1.DEFAULT_DEBIT_ACCOUNT_ID, t111.NAME AS DEFAULT_DEBIT_ACCOUNT_ID_TEXT, t1.GROUP_INVOICE_LINES, t1.ID, t1.JOURNAL_USER, t1.LOSS_ACCOUNT_ID, t81.NAME AS LOSS_ACCOUNT_ID_TEXT, t1.NAME, t1.POST_AT_BANK_REC, t1.PROFIT_ACCOUNT_ID, t31.NAME AS PROFIT_ACCOUNT_ID_TEXT, t1.REFUND_SEQUENCE, t1.REFUND_SEQUENCE_ID, t1.SEQUENCE, t1.SEQUENCE_ID, t1.SHOW_ON_DASHBOARD, t1.TYPE, t1.UPDATE_POSTED, t1.WRITE_DATE, t1.WRITE_UID, t71.NAME AS WRITE_UID_TEXT FROM ACCOUNT_JOURNAL t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN ACCOUNT_ACCOUNT t31 ON t1.PROFIT_ACCOUNT_ID = t31.ID LEFT JOIN MAIL_ALIAS t41 ON t1.ALIAS_ID = t41.ID LEFT JOIN RES_PARTNER_BANK t51 ON t1.BANK_ACCOUNT_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.WRITE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN ACCOUNT_ACCOUNT t81 ON t1.LOSS_ACCOUNT_ID = t81.ID LEFT JOIN ACCOUNT_ACCOUNT t91 ON t1.DEFAULT_CREDIT_ACCOUNT_ID = t91.ID LEFT JOIN RES_COMPANY t101 ON t1.COMPANY_ID = t101.ID LEFT JOIN ACCOUNT_ACCOUNT t111 ON t1.DEFAULT_DEBIT_ACCOUNT_ID = t111.ID LEFT JOIN RES_CURRENCY t121 ON t1.CURRENCY_ID = t121.ID LEFT JOIN RES_PARTNER t131 ON t101.PARTNER_ID = t131.ID
<![CDATA[ SELECT t1.ACTIVE, t1.ALIAS_ID, t41.ALIAS_NAME, t1.AT_LEAST_ONE_INBOUND, t1.AT_LEAST_ONE_OUTBOUND, t1.BANK_ACCOUNT_ID, t51.ACC_NUMBER AS BANK_ACC_NUMBER, t51.BANK_ID, t1.BANK_STATEMENTS_SOURCE, t1.CODE, t1.COLOR, t1.COMPANY_ID, t131.NAME AS COMPANY_ID_TEXT, t101.PARTNER_ID AS COMPANY_PARTNER_ID, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t1.CURRENCY_ID, t121.NAME AS CURRENCY_ID_TEXT, t1.DEFAULT_CREDIT_ACCOUNT_ID, t91.NAME AS DEFAULT_CREDIT_ACCOUNT_ID_TEXT, t1.DEFAULT_DEBIT_ACCOUNT_ID, t111.NAME AS DEFAULT_DEBIT_ACCOUNT_ID_TEXT, t1.GROUP_INVOICE_LINES, t1.ID, t1.JOURNAL_USER, t1.LOSS_ACCOUNT_ID, t81.NAME AS LOSS_ACCOUNT_ID_TEXT, t1.NAME, t1.POST_AT_BANK_REC, t1.PROFIT_ACCOUNT_ID, t31.NAME AS PROFIT_ACCOUNT_ID_TEXT, t1.REFUND_SEQUENCE, t1.REFUND_SEQUENCE_ID, t1.SEQUENCE, t1.SEQUENCE_ID, t1.SHOW_ON_DASHBOARD, t1.TYPE, t1.UPDATE_POSTED, t1.WRITE_DATE, t1.WRITE_UID, t71.NAME AS WRITE_UID_TEXT FROM ACCOUNT_JOURNAL t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN ACCOUNT_ACCOUNT t31 ON t1.PROFIT_ACCOUNT_ID = t31.ID LEFT JOIN MAIL_ALIAS t41 ON t1.ALIAS_ID = t41.ID LEFT JOIN RES_PARTNER_BANK t51 ON t1.BANK_ACCOUNT_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.WRITE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN ACCOUNT_ACCOUNT t81 ON t1.LOSS_ACCOUNT_ID = t81.ID LEFT JOIN ACCOUNT_ACCOUNT t91 ON t1.DEFAULT_CREDIT_ACCOUNT_ID = t91.ID LEFT JOIN RES_COMPANY t101 ON t1.COMPANY_ID = t101.ID LEFT JOIN ACCOUNT_ACCOUNT t111 ON t1.DEFAULT_DEBIT_ACCOUNT_ID = t111.ID LEFT JOIN RES_CURRENCY t121 ON t1.CURRENCY_ID = t121.ID LEFT JOIN RES_PARTNER t131 ON t101.PARTNER_ID = t131.ID
]]>
</sql>
......
businesscentral-core/src/main/resources/mapper/odoo_hr/hr_contract/Hr_contractMapper.xml
浏览文件 @ b27861ad
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="Hr_contractResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.ACTIVE, t1.ADVANTAGES, t1.COMPANY_ID, t41.NAME AS COMPANY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t31.CURRENCY_ID, t1.DATE_END, t1.DATE_START, t1.DEPARTMENT_ID, t71.NAME AS DEPARTMENT_ID_TEXT, t1.EMPLOYEE_ID, t111.NAME AS EMPLOYEE_ID_TEXT, t1.ID, t1.JOB_ID, t81.NAME AS JOB_ID_TEXT, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.NAME, t1.NOTES, t51.PERMIT_NO, t1.RESOURCE_CALENDAR_ID, t61.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.STATE, t1.TRIAL_DATE_END, t51.VISA_EXPIRE, t51.VISA_NO, t1.WAGE, t1.WRITE_DATE, t1.WRITE_UID, t101.NAME AS WRITE_UID_TEXT FROM HR_CONTRACT t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_COMPANY t31 ON t1.COMPANY_ID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN HR_EMPLOYEE t51 ON t1.EMPLOYEE_ID = t51.ID LEFT JOIN RESOURCE_CALENDAR t61 ON t1.RESOURCE_CALENDAR_ID = t61.ID LEFT JOIN HR_DEPARTMENT t71 ON t1.DEPARTMENT_ID = t71.ID LEFT JOIN HR_JOB t81 ON t1.JOB_ID = t81.ID LEFT JOIN RES_USERS t91 ON t1.WRITE_UID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID LEFT JOIN RESOURCE_RESOURCE t111 ON t51.RESOURCE_ID = t111.ID ) t1 where id=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.ACTIVE, t1.ADVANTAGES, t1.COMPANY_ID, t41.NAME AS COMPANY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t31.CURRENCY_ID, t1.DATE_END, t1.DATE_START, t1.DEPARTMENT_ID, t71.NAME AS DEPARTMENT_ID_TEXT, t1.EMPLOYEE_ID, t111.NAME AS EMPLOYEE_ID_TEXT, t1.HR_RESPONSIBLE_ID, t131.NAME AS HR_RESPONSIBLE_NAME, t1.ID, t1.JOB_ID, t81.NAME AS JOB_ID_TEXT, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.NAME, t1.NOTES, t51.PERMIT_NO, t1.RESOURCE_CALENDAR_ID, t61.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.STATE, t1.TRIAL_DATE_END, t51.VISA_EXPIRE, t51.VISA_NO, t1.WAGE, t1.WRITE_DATE, t1.WRITE_UID, t101.NAME AS WRITE_UID_TEXT FROM HR_CONTRACT t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_COMPANY t31 ON t1.COMPANY_ID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN HR_EMPLOYEE t51 ON t1.EMPLOYEE_ID = t51.ID LEFT JOIN RESOURCE_CALENDAR t61 ON t1.RESOURCE_CALENDAR_ID = t61.ID LEFT JOIN HR_DEPARTMENT t71 ON t1.DEPARTMENT_ID = t71.ID LEFT JOIN HR_JOB t81 ON t1.JOB_ID = t81.ID LEFT JOIN RES_USERS t91 ON t1.WRITE_UID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID LEFT JOIN RESOURCE_RESOURCE t111 ON t51.RESOURCE_ID = t111.ID LEFT JOIN RES_USERS t121 ON t1.HR_RESPONSIBLE_ID = t121.ID LEFT JOIN RES_PARTNER t131 ON t121.PARTNER_ID = t131.ID ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -56,8 +56,12 @@
<result property="companyId" column="company_id" />
<result property="jobId" column="job_id" />
<result property="departmentId" column="department_id" />
<result property="hrResponsibleId" column="hr_responsible_id" />
<result property="hrResponsibleName" column="hr_responsible_name" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooHrResponsible" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="hr_responsible_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooDepartment" javaType="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_department" column="department_id" select="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_departmentMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
......@@ -74,6 +78,13 @@
<association property="odooWrite" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="write_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_CONTRACT_RES_USERS_HR_RESPONSIBLE_ID] -->
<select id="selectByHrResponsibleId" resultMap="Hr_contractResultMap">
select t1.* from (
<include refid="Default" />
) t1
where hr_responsible_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_CONTRACT__HR_DEPARTMENT__DEPARTMENT_ID] -->
<select id="selectByDepartmentId" resultMap="Hr_contractResultMap">
select t1.* from (
......@@ -135,12 +146,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.ACTIVE, t1.COMPANY_ID, t41.NAME AS COMPANY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t31.CURRENCY_ID, t1.DATE_END, t1.DATE_START, t1.DEPARTMENT_ID, t71.NAME AS DEPARTMENT_ID_TEXT, t1.EMPLOYEE_ID, t111.NAME AS EMPLOYEE_ID_TEXT, t1.ID, t1.JOB_ID, t81.NAME AS JOB_ID_TEXT, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.NAME, t51.PERMIT_NO, t1.RESOURCE_CALENDAR_ID, t61.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.STATE, t1.TRIAL_DATE_END, t51.VISA_EXPIRE, t51.VISA_NO, t1.WAGE, t1.WRITE_DATE, t1.WRITE_UID, t101.NAME AS WRITE_UID_TEXT FROM HR_CONTRACT t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_COMPANY t31 ON t1.COMPANY_ID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN HR_EMPLOYEE t51 ON t1.EMPLOYEE_ID = t51.ID LEFT JOIN RESOURCE_CALENDAR t61 ON t1.RESOURCE_CALENDAR_ID = t61.ID LEFT JOIN HR_DEPARTMENT t71 ON t1.DEPARTMENT_ID = t71.ID LEFT JOIN HR_JOB t81 ON t1.JOB_ID = t81.ID LEFT JOIN RES_USERS t91 ON t1.WRITE_UID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID LEFT JOIN RESOURCE_RESOURCE t111 ON t51.RESOURCE_ID = t111.ID
<![CDATA[ SELECT t1.ACTIVE, t1.COMPANY_ID, t41.NAME AS COMPANY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t31.CURRENCY_ID, t1.DATE_END, t1.DATE_START, t1.DEPARTMENT_ID, t71.NAME AS DEPARTMENT_ID_TEXT, t1.EMPLOYEE_ID, t111.NAME AS EMPLOYEE_ID_TEXT, t1.HR_RESPONSIBLE_ID, t131.NAME AS HR_RESPONSIBLE_NAME, t1.ID, t1.JOB_ID, t81.NAME AS JOB_ID_TEXT, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.NAME, t51.PERMIT_NO, t1.RESOURCE_CALENDAR_ID, t61.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.STATE, t1.TRIAL_DATE_END, t51.VISA_EXPIRE, t51.VISA_NO, t1.WAGE, t1.WRITE_DATE, t1.WRITE_UID, t101.NAME AS WRITE_UID_TEXT FROM HR_CONTRACT t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_COMPANY t31 ON t1.COMPANY_ID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN HR_EMPLOYEE t51 ON t1.EMPLOYEE_ID = t51.ID LEFT JOIN RESOURCE_CALENDAR t61 ON t1.RESOURCE_CALENDAR_ID = t61.ID LEFT JOIN HR_DEPARTMENT t71 ON t1.DEPARTMENT_ID = t71.ID LEFT JOIN HR_JOB t81 ON t1.JOB_ID = t81.ID LEFT JOIN RES_USERS t91 ON t1.WRITE_UID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID LEFT JOIN RESOURCE_RESOURCE t111 ON t51.RESOURCE_ID = t111.ID LEFT JOIN RES_USERS t121 ON t1.HR_RESPONSIBLE_ID = t121.ID LEFT JOIN RES_PARTNER t131 ON t121.PARTNER_ID = t131.ID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.ACTIVE, t1.ADVANTAGES, t1.COMPANY_ID, t41.NAME AS COMPANY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t31.CURRENCY_ID, t1.DATE_END, t1.DATE_START, t1.DEPARTMENT_ID, t71.NAME AS DEPARTMENT_ID_TEXT, t1.EMPLOYEE_ID, t111.NAME AS EMPLOYEE_ID_TEXT, t1.ID, t1.JOB_ID, t81.NAME AS JOB_ID_TEXT, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.NAME, t1.NOTES, t51.PERMIT_NO, t1.RESOURCE_CALENDAR_ID, t61.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.STATE, t1.TRIAL_DATE_END, t51.VISA_EXPIRE, t51.VISA_NO, t1.WAGE, t1.WRITE_DATE, t1.WRITE_UID, t101.NAME AS WRITE_UID_TEXT FROM HR_CONTRACT t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_COMPANY t31 ON t1.COMPANY_ID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN HR_EMPLOYEE t51 ON t1.EMPLOYEE_ID = t51.ID LEFT JOIN RESOURCE_CALENDAR t61 ON t1.RESOURCE_CALENDAR_ID = t61.ID LEFT JOIN HR_DEPARTMENT t71 ON t1.DEPARTMENT_ID = t71.ID LEFT JOIN HR_JOB t81 ON t1.JOB_ID = t81.ID LEFT JOIN RES_USERS t91 ON t1.WRITE_UID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID LEFT JOIN RESOURCE_RESOURCE t111 ON t51.RESOURCE_ID = t111.ID
<![CDATA[ SELECT t1.ACTIVE, t1.ADVANTAGES, t1.COMPANY_ID, t41.NAME AS COMPANY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t21.NAME AS CREATE_UID_TEXT, t31.CURRENCY_ID, t1.DATE_END, t1.DATE_START, t1.DEPARTMENT_ID, t71.NAME AS DEPARTMENT_ID_TEXT, t1.EMPLOYEE_ID, t111.NAME AS EMPLOYEE_ID_TEXT, t1.HR_RESPONSIBLE_ID, t131.NAME AS HR_RESPONSIBLE_NAME, t1.ID, t1.JOB_ID, t81.NAME AS JOB_ID_TEXT, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.NAME, t1.NOTES, t51.PERMIT_NO, t1.RESOURCE_CALENDAR_ID, t61.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.STATE, t1.TRIAL_DATE_END, t51.VISA_EXPIRE, t51.VISA_NO, t1.WAGE, t1.WRITE_DATE, t1.WRITE_UID, t101.NAME AS WRITE_UID_TEXT FROM HR_CONTRACT t1 LEFT JOIN RES_USERS t11 ON t1.CREATE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_COMPANY t31 ON t1.COMPANY_ID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN HR_EMPLOYEE t51 ON t1.EMPLOYEE_ID = t51.ID LEFT JOIN RESOURCE_CALENDAR t61 ON t1.RESOURCE_CALENDAR_ID = t61.ID LEFT JOIN HR_DEPARTMENT t71 ON t1.DEPARTMENT_ID = t71.ID LEFT JOIN HR_JOB t81 ON t1.JOB_ID = t81.ID LEFT JOIN RES_USERS t91 ON t1.WRITE_UID = t91.ID LEFT JOIN RES_PARTNER t101 ON t91.PARTNER_ID = t101.ID LEFT JOIN RESOURCE_RESOURCE t111 ON t51.RESOURCE_ID = t111.ID LEFT JOIN RES_USERS t121 ON t1.HR_RESPONSIBLE_ID = t121.ID LEFT JOIN RES_PARTNER t131 ON t121.PARTNER_ID = t131.ID
]]>
</sql>
......
businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json
浏览文件 @ b27861ad
......@@ -19061,19 +19061,6 @@
"major_field":0
},
{
"fieldname":"AMOUNT_AUTHORIZED_DIFF" ,
"codename":"Amount_authorized_diff",
"field_logic_name":"授权差异的总金额",
"entity_name":"Account_journal",
"field_type":"FLOAT",
"nullable":1,
"physical_field":1,
"data_type":"FLOAT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"KANBAN_DASHBOARD_GRAPH" ,
"codename":"Kanban_dashboard_graph",
"field_logic_name":"看板仪表板图表",
......@@ -63116,11 +63103,52 @@
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"HR_RESPONSIBLE_ID" ,
"codename":"Hr_responsible_id",
"field_logic_name":"人力资源主管",
"entity_name":"Hr_contract",
"ref_de":"RES_USERS",
"ref_field_name":"ID",
"relation_name":"DER1N_HR_CONTRACT_RES_USERS_HR_RESPONSIBLE_ID",
"relation_codename":"Odoo_hr_responsible",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"HR_RESPONSIBLE_NAME" ,
"codename":"Hr_responsible_name",
"field_logic_name":"人力资源主管",
"entity_name":"Hr_contract",
"ref_de":"RES_USERS",
"ref_field_name":"NAME",
"relation_name":"DER1N_HR_CONTRACT_RES_USERS_HR_RESPONSIBLE_ID",
"relation_codename":"Odoo_hr_responsible",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
}
],
"subEntitys":[
],
"parentEntitys":[
{"name":"DER1N_HR_CONTRACT_RES_USERS_HR_RESPONSIBLE_ID",
"relation_type":"DER1N",
"code_name":"Odoo_hr_responsible",
"entity_name":"HR_CONTRACT",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_HR_CONTRACT__HR_DEPARTMENT__DEPARTMENT_ID",
"relation_type":"DER1N",
"code_name":"Odoo_department",
......@@ -158518,6 +158546,12 @@
"entity_name":"HR_ATTENDANCE",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_HR_CONTRACT_RES_USERS_HR_RESPONSIBLE_ID",
"relation_type":"DER1N",
"code_name":"Odoo_hr_responsible",
"entity_name":"HR_CONTRACT",
"ref_entity_name":"RES_USERS"
},
{"name":"DER1N_HR_CONTRACT_TYPE__RES_USERS__CREATE_UID",
"relation_type":"DER1N",
"code_name":"Odoo_create",
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Account_journalDTO.java
浏览文件 @ b27861ad
......@@ -244,14 +244,6 @@ public class Account_journalDTO extends DTOBase implements Serializable {
@JsonProperty("update_posted")
private Boolean updatePosted;
/**
* 属性 [AMOUNT_AUTHORIZED_DIFF]
*
*/
@JSONField(name = "amount_authorized_diff")
@JsonProperty("amount_authorized_diff")
private Double amountAuthorizedDiff;
/**
* 属性 [KANBAN_DASHBOARD_GRAPH]
*
......@@ -617,14 +609,6 @@ public class Account_journalDTO extends DTOBase implements Serializable {
this.modify("update_posted",updatePosted);
}
/**
* 设置 [AMOUNT_AUTHORIZED_DIFF]
*/
public void setAmountAuthorizedDiff(Double amountAuthorizedDiff){
this.amountAuthorizedDiff = amountAuthorizedDiff ;
this.modify("amount_authorized_diff",amountAuthorizedDiff);
}
/**
* 设置 [TYPE]
*/
......
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Hr_contractDTO.java
浏览文件 @ b27861ad
......@@ -487,6 +487,24 @@ public class Hr_contractDTO extends DTOBase implements Serializable {
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
/**
* 属性 [HR_RESPONSIBLE_ID]
*
*/
@JSONField(name = "hr_responsible_id")
@JsonProperty("hr_responsible_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long hrResponsibleId;
/**
* 属性 [HR_RESPONSIBLE_NAME]
*
*/
@JSONField(name = "hr_responsible_name")
@JsonProperty("hr_responsible_name")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String hrResponsibleName;
/**
* 设置 [DATE_END]
......@@ -608,6 +626,14 @@ public class Hr_contractDTO extends DTOBase implements Serializable {
this.modify("department_id",departmentId);
}
/**
* 设置 [HR_RESPONSIBLE_ID]
*/
public void setHrResponsibleId(Long hrResponsibleId){
this.hrResponsibleId = hrResponsibleId ;
this.modify("hr_responsible_id",hrResponsibleId);
}
}
......
businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/annotation/DEField.java
浏览文件 @ b27861ad
......@@ -2,6 +2,7 @@ package cn.ibizlab.businesscentral.util.annotation;
import cn.ibizlab.businesscentral.util.enums.DEFieldDefaultValueType;
import cn.ibizlab.businesscentral.util.enums.DEPredefinedFieldType;
import cn.ibizlab.businesscentral.util.enums.DupCheck;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
......@@ -66,5 +67,14 @@ public @interface DEField
* @return
*/
String format() default "";
/**
* 重复性检查
* @return
*/
DupCheck dupCheck() default DupCheck.NONE;
/**
* 范围属性
*/
String dupCheckField() default "";
}
businesscentral-util/src/main/java/cn/ibizlab/businesscentral/util/enums/DupCheck.java 0 → 100644
浏览文件 @ b27861ad
package cn.ibizlab.businesscentral.util.enums;
/**
* 属性重复值检查
*/
public enum DupCheck {
/**
* 不检查
*/
NONE,
/**
* 全部检查
*/
ALL,
/**
* 非空检查
*/
NOTNULL,
/**
* 指定范围检查
*/
RANGE,
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或