Skip to content

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

xignzi006 发布系统代码，后台体系[Spring Boot]

上级 fc0ca110
隐藏空白字符变更
内嵌 并排
正在显示 包含 20 行增加 和 246 行删除
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/domain/Hr_contract.java
浏览文件 @ 18244a38
......@@ -31,7 +31,7 @@ import cn.ibizlab.businesscentral.util.domain.EntityMP;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
/**
* 实体[Contract]
* 实体[合同]
*/
@Getter
@Setter
......@@ -139,14 +139,6 @@ public class Hr_contract extends EntityMP implements Serializable {
@JSONField(name = "wage")
@JsonProperty("wage")
private BigDecimal wage;
/**
* 社交管理中心
*/
@DEField(name = "reported_to_secretariat")
@TableField(value = "reported_to_secretariat")
@JSONField(name = "reported_to_secretariat")
@JsonProperty("reported_to_secretariat")
private Boolean reportedToSecretariat;
/**
* 开始日期
*/
......@@ -365,13 +357,6 @@ public class Hr_contract extends EntityMP implements Serializable {
@JSONField(name = "employee_id_text")
@JsonProperty("employee_id_text")
private String employeeIdText;
/**
* 员工类别
*/
@TableField(exist = false)
@JSONField(name = "type_id_text")
@JsonProperty("type_id_text")
private String typeIdText;
/**
* 签证到期日期
*/
......@@ -443,22 +428,6 @@ public class Hr_contract extends EntityMP implements Serializable {
@JSONField(name = "department_id")
@JsonProperty("department_id")
private Long departmentId;
/**
* 员工类别
*/
@DEField(name = "type_id")
@TableField(value = "type_id")
@JSONField(name = "type_id")
@JsonProperty("type_id")
private Long typeId;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_contract_type odooType;
/**
*
......@@ -568,14 +537,6 @@ public class Hr_contract extends EntityMP implements Serializable {
this.modify("wage",wage);
}
/**
* 设置 [社交管理中心]
*/
public void setReportedToSecretariat(Boolean reportedToSecretariat){
this.reportedToSecretariat = reportedToSecretariat ;
this.modify("reported_to_secretariat",reportedToSecretariat);
}
/**
* 设置 [开始日期]
*/
......@@ -676,14 +637,6 @@ public class Hr_contract extends EntityMP implements Serializable {
this.modify("department_id",departmentId);
}
/**
* 设置 [员工类别]
*/
public void setTypeId(Long typeId){
this.typeId = typeId ;
this.modify("type_id",typeId);
}
@Override
public Serializable getDefaultKey(boolean gen) {
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/filter/Hr_contractSearchContext.java
浏览文件 @ 18244a38
......@@ -145,20 +145,6 @@ public class Hr_contractSearchContext extends QueryWrapperContext<Hr_contract> {
if(!ObjectUtils.isEmpty(this.n_employee_id_text_like)){
this.getSearchCond().like("employee_id_text", n_employee_id_text_like);
}
}
private String n_type_id_text_eq;//[员工类别]
public void setN_type_id_text_eq(String n_type_id_text_eq) {
this.n_type_id_text_eq = n_type_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_type_id_text_eq)){
this.getSearchCond().eq("type_id_text", n_type_id_text_eq);
}
}
private String n_type_id_text_like;//[员工类别]
public void setN_type_id_text_like(String n_type_id_text_like) {
this.n_type_id_text_like = n_type_id_text_like;
if(!ObjectUtils.isEmpty(this.n_type_id_text_like)){
this.getSearchCond().like("type_id_text", n_type_id_text_like);
}
}
private Long n_resource_calendar_id_eq;//[工作安排]
public void setN_resource_calendar_id_eq(Long n_resource_calendar_id_eq) {
......@@ -209,13 +195,6 @@ public class Hr_contractSearchContext extends QueryWrapperContext<Hr_contract> {
this.getSearchCond().eq("department_id", n_department_id_eq);
}
}
private Long n_type_id_eq;//[员工类别]
public void setN_type_id_eq(Long n_type_id_eq) {
this.n_type_id_eq = n_type_id_eq;
if(!ObjectUtils.isEmpty(this.n_type_id_eq)){
this.getSearchCond().eq("type_id", n_type_id_eq);
}
}
/**
* 启用快速搜索
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_hr/mapper/Hr_contractMapper.java
浏览文件 @ 18244a38
......@@ -62,8 +62,6 @@ public interface Hr_contractMapper extends BaseMapper<Hr_contract>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<Hr_contract> selectByTypeId(@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
浏览文件 @ 18244a38
......@@ -37,10 +37,6 @@ 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> selectByTypeId(Long id);
void resetByTypeId(Long id);
void resetByTypeId(Collection<Long> ids);
void removeByTypeId(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
浏览文件 @ 18244a38
......@@ -44,15 +44,12 @@ import com.alibaba.fastjson.JSONObject;
import org.springframework.util.StringUtils;
/**
* 实体[Contract] 服务对象接口实现
* 实体[合同] 服务对象接口实现
*/
@Slf4j
@Service("Hr_contractServiceImpl")
public class Hr_contractServiceImpl extends EBSServiceImpl<Hr_contractMapper, Hr_contract> implements IHr_contractService {
@Autowired
@Lazy
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;
......@@ -209,25 +206,6 @@ public class Hr_contractServiceImpl extends EBSServiceImpl<Hr_contractMapper, Hr
}
@Override
public List<Hr_contract> selectByTypeId(Long id) {
return baseMapper.selectByTypeId(id);
}
@Override
public void resetByTypeId(Long id) {
this.update(new UpdateWrapper<Hr_contract>().set("type_id",null).eq("type_id",id));
}
@Override
public void resetByTypeId(Collection<Long> ids) {
this.update(new UpdateWrapper<Hr_contract>().set("type_id",null).in("type_id",ids));
}
@Override
public void removeByTypeId(Long id) {
this.remove(new QueryWrapper<Hr_contract>().eq("type_id",id));
}
@Override
public List<Hr_contract> selectByDepartmentId(Long id) {
return baseMapper.selectByDepartmentId(id);
......@@ -358,16 +336,6 @@ public class Hr_contractServiceImpl extends EBSServiceImpl<Hr_contractMapper, Hr
* @param et
*/
private void fillParentData(Hr_contract et){
//实体关系[DER1N_HR_CONTRACT__HR_CONTRACT_TYPE__TYPE_ID]
if(!ObjectUtils.isEmpty(et.getTypeId())){
cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_contract_type odooType=et.getOdooType();
if(ObjectUtils.isEmpty(odooType)){
cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_contract_type majorEntity=hrContractTypeService.get(et.getTypeId());
et.setOdooType(majorEntity);
odooType=majorEntity;
}
et.setTypeIdText(odooType.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/java/cn/ibizlab/businesscentral/core/odoo_hr/service/impl/Hr_contract_typeServiceImpl.java
浏览文件 @ 18244a38
......@@ -50,9 +50,6 @@ import org.springframework.util.StringUtils;
@Service("Hr_contract_typeServiceImpl")
public class Hr_contract_typeServiceImpl extends EBSServiceImpl<Hr_contract_typeMapper, Hr_contract_type> implements IHr_contract_typeService {
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_hr.service.IHr_contractService hrContractService;
@Autowired
@Lazy
protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;
......@@ -127,7 +124,6 @@ public class Hr_contract_typeServiceImpl extends EBSServiceImpl<Hr_contract_type
@Override
@Transactional
public boolean remove(Long key) {
hrContractService.resetByTypeId(key);
boolean result=removeById(key);
return result ;
}
......@@ -135,7 +131,6 @@ public class Hr_contract_typeServiceImpl extends EBSServiceImpl<Hr_contract_type
@Override
@Transactional
public void removeBatch(Collection<Long> idList) {
hrContractService.resetByTypeId(idList);
removeByIds(idList);
}
......
businesscentral-core/src/main/resources/mapper/odoo_hr/hr_contract/Hr_contractMapper.xml
浏览文件 @ 18244a38
......@@ -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.REPORTED_TO_SECRETARIAT, t1.RESOURCE_CALENDAR_ID, t61.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.STATE, t1.TRIAL_DATE_END, t1.TYPE_ID, t121.NAME AS TYPE_ID_TEXT, 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 HR_CONTRACT_TYPE t121 ON t1.TYPE_ID = t121.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.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}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -20,7 +20,6 @@
<result property="messageChannelIds" column="message_channel_ids" />
<result property="messageUnread" column="message_unread" />
<result property="LastUpdate" column="__last_update" />
<result property="reportedToSecretariat" column="reported_to_secretariat" />
<result property="dateStart" column="date_start" />
<result property="activityState" column="activity_state" />
<result property="messageIds" column="message_ids" />
......@@ -48,7 +47,6 @@
<result property="writeUidText" column="write_uid_text" />
<result property="currencyId" column="currency_id" />
<result property="employeeIdText" column="employee_id_text" />
<result property="typeIdText" column="type_id_text" />
<result property="visaExpire" column="visa_expire" />
<result property="visaNo" column="visa_no" />
<result property="resourceCalendarId" column="resource_calendar_id" />
......@@ -58,11 +56,8 @@
<result property="companyId" column="company_id" />
<result property="jobId" column="job_id" />
<result property="departmentId" column="department_id" />
<result property="typeId" column="type_id" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="odooType" javaType="cn.ibizlab.businesscentral.core.odoo_hr.domain.Hr_contract_type" column="type_id" select="cn.ibizlab.businesscentral.core.odoo_hr.mapper.Hr_contract_typeMapper.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"为懒加载配置 -->
......@@ -79,13 +74,6 @@
<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__HR_CONTRACT_TYPE__TYPE_ID] -->
<select id="selectByTypeId" resultMap="Hr_contractResultMap">
select t1.* from (
<include refid="Default" />
) t1
where type_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HR_CONTRACT__HR_DEPARTMENT__DEPARTMENT_ID] -->
<select id="selectByDepartmentId" resultMap="Hr_contractResultMap">
select t1.* from (
......@@ -147,12 +135,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.REPORTED_TO_SECRETARIAT, t1.RESOURCE_CALENDAR_ID, t61.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.STATE, t1.TRIAL_DATE_END, t1.TYPE_ID, t121.NAME AS TYPE_ID_TEXT, 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 HR_CONTRACT_TYPE t121 ON t1.TYPE_ID = t121.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.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
]]>
</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.REPORTED_TO_SECRETARIAT, t1.RESOURCE_CALENDAR_ID, t61.NAME AS RESOURCE_CALENDAR_ID_TEXT, t1.STATE, t1.TRIAL_DATE_END, t1.TYPE_ID, t121.NAME AS TYPE_ID_TEXT, 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 HR_CONTRACT_TYPE t121 ON t1.TYPE_ID = t121.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.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
]]>
</sql>
......
businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json
浏览文件 @ 18244a38
......@@ -61865,7 +61865,7 @@
,
{
"entity_name":"HR_CONTRACT",
"logic_name":"Contract",
"logic_name":"合同",
"code_name":"Hr_contract",
"table_name":"HR_CONTRACT",
"system_id":"iBizBusinessCentral",
......@@ -62048,19 +62048,6 @@
"major_field":0
},
{
"fieldname":"REPORTED_TO_SECRETARIAT" ,
"codename":"Reported_to_secretariat",
"field_logic_name":"社交管理中心",
"entity_name":"Hr_contract",
"field_type":"TRUEFALSE",
"nullable":1,
"physical_field":1,
"data_type":"BIT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"DATE_START" ,
"codename":"Date_start",
"field_logic_name":"开始日期",
......@@ -62505,24 +62492,6 @@
"major_field":0
},
{
"fieldname":"TYPE_ID_TEXT" ,
"codename":"Type_id_text",
"field_logic_name":"员工类别",
"entity_name":"Hr_contract",
"ref_de":"HR_CONTRACT_TYPE",
"ref_field_name":"NAME",
"relation_name":"DER1N_HR_CONTRACT__HR_CONTRACT_TYPE__TYPE_ID",
"relation_codename":"Odoo_type",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":200,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"VISA_EXPIRE" ,
"codename":"Visa_expire",
"field_logic_name":"签证到期日期",
......@@ -62677,34 +62646,11 @@
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"TYPE_ID" ,
"codename":"Type_id",
"field_logic_name":"员工类别",
"entity_name":"Hr_contract",
"ref_de":"HR_CONTRACT_TYPE",
"ref_field_name":"ID",
"relation_name":"DER1N_HR_CONTRACT__HR_CONTRACT_TYPE__TYPE_ID",
"relation_codename":"Odoo_type",
"field_type":"PICKUP",
"nullable":0,
"physical_field":1,
"data_type":"BIGINT",
"key_field":0,
"show_order":1000,
"major_field":0
}
],
"subEntitys":[
],
"parentEntitys":[
{"name":"DER1N_HR_CONTRACT__HR_CONTRACT_TYPE__TYPE_ID",
"relation_type":"DER1N",
"code_name":"Odoo_type",
"entity_name":"HR_CONTRACT",
"ref_entity_name":"HR_CONTRACT_TYPE"
},
{"name":"DER1N_HR_CONTRACT__HR_DEPARTMENT__DEPARTMENT_ID",
"relation_type":"DER1N",
"code_name":"Odoo_department",
......@@ -62927,12 +62873,6 @@
}
],
"subEntitys":[
{"name":"DER1N_HR_CONTRACT__HR_CONTRACT_TYPE__TYPE_ID",
"relation_type":"DER1N",
"code_name":"Odoo_type",
"entity_name":"HR_CONTRACT",
"ref_entity_name":"HR_CONTRACT_TYPE"
}
],
"parentEntitys":[
{"name":"DER1N_HR_CONTRACT_TYPE__RES_USERS__CREATE_UID",
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Hr_contractDTO.java
浏览文件 @ 18244a38
......@@ -145,14 +145,6 @@ public class Hr_contractDTO extends DTOBase implements Serializable {
@NotNull(message = "[工资]不允许为空!")
private BigDecimal wage;
/**
* 属性 [REPORTED_TO_SECRETARIAT]
*
*/
@JSONField(name = "reported_to_secretariat")
@JsonProperty("reported_to_secretariat")
private Boolean reportedToSecretariat;
/**
* 属性 [DATE_START]
*
......@@ -414,15 +406,6 @@ public class Hr_contractDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String employeeIdText;
/**
* 属性 [TYPE_ID_TEXT]
*
*/
@JSONField(name = "type_id_text")
@JsonProperty("type_id_text")
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String typeIdText;
/**
* 属性 [VISA_EXPIRE]
*
......@@ -504,16 +487,6 @@ public class Hr_contractDTO extends DTOBase implements Serializable {
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
/**
* 属性 [TYPE_ID]
*
*/
@JSONField(name = "type_id")
@JsonProperty("type_id")
@JsonSerialize(using = ToStringSerializer.class)
@NotNull(message = "[员工类别]不允许为空!")
private Long typeId;
/**
* 设置 [DATE_END]
......@@ -555,14 +528,6 @@ public class Hr_contractDTO extends DTOBase implements Serializable {
this.modify("wage",wage);
}
/**
* 设置 [REPORTED_TO_SECRETARIAT]
*/
public void setReportedToSecretariat(Boolean reportedToSecretariat){
this.reportedToSecretariat = reportedToSecretariat ;
this.modify("reported_to_secretariat",reportedToSecretariat);
}
/**
* 设置 [DATE_START]
*/
......@@ -643,14 +608,6 @@ public class Hr_contractDTO extends DTOBase implements Serializable {
this.modify("department_id",departmentId);
}
/**
* 设置 [TYPE_ID]
*/
public void setTypeId(Long typeId){
this.typeId = typeId ;
this.modify("type_id",typeId);
}
}
......
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/rest/Hr_contractResource.java
浏览文件 @ 18244a38
......@@ -35,7 +35,7 @@ import cn.ibizlab.businesscentral.core.odoo_hr.filter.Hr_contractSearchContext;
import cn.ibizlab.businesscentral.util.annotation.VersionCheck;
@Slf4j
@Api(tags = {"Contract" })
@Api(tags = {"合同" })
@RestController("Core-hr_contract")
@RequestMapping("")
public class Hr_contractResource {
......@@ -48,7 +48,7 @@ public class Hr_contractResource {
public Hr_contractMapping hr_contractMapping;
@PreAuthorize("hasPermission(this.hr_contractMapping.toDomain(#hr_contractdto),'iBizBusinessCentral-Hr_contract-Create')")
@ApiOperation(value = "新建Contract", tags = {"Contract" }, notes = "新建Contract")
@ApiOperation(value = "新建合同", tags = {"合同" }, notes = "新建合同")
@RequestMapping(method = RequestMethod.POST, value = "/hr_contracts")
public ResponseEntity<Hr_contractDTO> create(@Validated @RequestBody Hr_contractDTO hr_contractdto) {
Hr_contract domain = hr_contractMapping.toDomain(hr_contractdto);
......@@ -58,7 +58,7 @@ public class Hr_contractResource {
}
@PreAuthorize("hasPermission(this.hr_contractMapping.toDomain(#hr_contractdtos),'iBizBusinessCentral-Hr_contract-Create')")
@ApiOperation(value = "批量新建Contract", tags = {"Contract" }, notes = "批量新建Contract")
@ApiOperation(value = "批量新建合同", tags = {"合同" }, notes = "批量新建合同")
@RequestMapping(method = RequestMethod.POST, value = "/hr_contracts/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<Hr_contractDTO> hr_contractdtos) {
hr_contractService.createBatch(hr_contractMapping.toDomain(hr_contractdtos));
......@@ -67,7 +67,7 @@ public class Hr_contractResource {
@VersionCheck(entity = "hr_contract" , versionfield = "writeDate")
@PreAuthorize("hasPermission(this.hr_contractService.get(#hr_contract_id),'iBizBusinessCentral-Hr_contract-Update')")
@ApiOperation(value = "更新Contract", tags = {"Contract" }, notes = "更新Contract")
@ApiOperation(value = "更新合同", tags = {"合同" }, notes = "更新合同")
@RequestMapping(method = RequestMethod.PUT, value = "/hr_contracts/{hr_contract_id}")
public ResponseEntity<Hr_contractDTO> update(@PathVariable("hr_contract_id") Long hr_contract_id, @RequestBody Hr_contractDTO hr_contractdto) {
Hr_contract domain = hr_contractMapping.toDomain(hr_contractdto);
......@@ -78,7 +78,7 @@ public class Hr_contractResource {
}
@PreAuthorize("hasPermission(this.hr_contractService.getHrContractByEntities(this.hr_contractMapping.toDomain(#hr_contractdtos)),'iBizBusinessCentral-Hr_contract-Update')")
@ApiOperation(value = "批量更新Contract", tags = {"Contract" }, notes = "批量更新Contract")
@ApiOperation(value = "批量更新合同", tags = {"合同" }, notes = "批量更新合同")
@RequestMapping(method = RequestMethod.PUT, value = "/hr_contracts/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<Hr_contractDTO> hr_contractdtos) {
hr_contractService.updateBatch(hr_contractMapping.toDomain(hr_contractdtos));
......@@ -86,14 +86,14 @@ public class Hr_contractResource {
}
@PreAuthorize("hasPermission(this.hr_contractService.get(#hr_contract_id),'iBizBusinessCentral-Hr_contract-Remove')")
@ApiOperation(value = "删除Contract", tags = {"Contract" }, notes = "删除Contract")
@ApiOperation(value = "删除合同", tags = {"合同" }, notes = "删除合同")
@RequestMapping(method = RequestMethod.DELETE, value = "/hr_contracts/{hr_contract_id}")
public ResponseEntity<Boolean> remove(@PathVariable("hr_contract_id") Long hr_contract_id) {
return ResponseEntity.status(HttpStatus.OK).body(hr_contractService.remove(hr_contract_id));
}
@PreAuthorize("hasPermission(this.hr_contractService.getHrContractByIds(#ids),'iBizBusinessCentral-Hr_contract-Remove')")
@ApiOperation(value = "批量删除Contract", tags = {"Contract" }, notes = "批量删除Contract")
@ApiOperation(value = "批量删除合同", tags = {"合同" }, notes = "批量删除合同")
@RequestMapping(method = RequestMethod.DELETE, value = "/hr_contracts/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<Long> ids) {
hr_contractService.removeBatch(ids);
......@@ -101,7 +101,7 @@ public class Hr_contractResource {
}
@PostAuthorize("hasPermission(this.hr_contractMapping.toDomain(returnObject.body),'iBizBusinessCentral-Hr_contract-Get')")
@ApiOperation(value = "获取Contract", tags = {"Contract" }, notes = "获取Contract")
@ApiOperation(value = "获取合同", tags = {"合同" }, notes = "获取合同")
@RequestMapping(method = RequestMethod.GET, value = "/hr_contracts/{hr_contract_id}")
public ResponseEntity<Hr_contractDTO> get(@PathVariable("hr_contract_id") Long hr_contract_id) {
Hr_contract domain = hr_contractService.get(hr_contract_id);
......@@ -109,27 +109,27 @@ public class Hr_contractResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@ApiOperation(value = "获取Contract草稿", tags = {"Contract" }, notes = "获取Contract草稿")
@ApiOperation(value = "获取合同草稿", tags = {"合同" }, notes = "获取合同草稿")
@RequestMapping(method = RequestMethod.GET, value = "/hr_contracts/getdraft")
public ResponseEntity<Hr_contractDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(hr_contractMapping.toDto(hr_contractService.getDraft(new Hr_contract())));
}
@ApiOperation(value = "检查Contract", tags = {"Contract" }, notes = "检查Contract")
@ApiOperation(value = "检查合同", tags = {"合同" }, notes = "检查合同")
@RequestMapping(method = RequestMethod.POST, value = "/hr_contracts/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody Hr_contractDTO hr_contractdto) {
return ResponseEntity.status(HttpStatus.OK).body(hr_contractService.checkKey(hr_contractMapping.toDomain(hr_contractdto)));
}
@PreAuthorize("hasPermission(this.hr_contractMapping.toDomain(#hr_contractdto),'iBizBusinessCentral-Hr_contract-Save')")
@ApiOperation(value = "保存Contract", tags = {"Contract" }, notes = "保存Contract")
@ApiOperation(value = "保存合同", tags = {"合同" }, notes = "保存合同")
@RequestMapping(method = RequestMethod.POST, value = "/hr_contracts/save")
public ResponseEntity<Boolean> save(@RequestBody Hr_contractDTO hr_contractdto) {
return ResponseEntity.status(HttpStatus.OK).body(hr_contractService.save(hr_contractMapping.toDomain(hr_contractdto)));
}
@PreAuthorize("hasPermission(this.hr_contractMapping.toDomain(#hr_contractdtos),'iBizBusinessCentral-Hr_contract-Save')")
@ApiOperation(value = "批量保存Contract", tags = {"Contract" }, notes = "批量保存Contract")
@ApiOperation(value = "批量保存合同", tags = {"合同" }, notes = "批量保存合同")
@RequestMapping(method = RequestMethod.POST, value = "/hr_contracts/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<Hr_contractDTO> hr_contractdtos) {
hr_contractService.saveBatch(hr_contractMapping.toDomain(hr_contractdtos));
......@@ -137,7 +137,7 @@ public class Hr_contractResource {
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_contract-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Hr_contract-Get')")
@ApiOperation(value = "获取数据集", tags = {"Contract" } ,notes = "获取数据集")
@ApiOperation(value = "获取数据集", tags = {"合同" } ,notes = "获取数据集")
@RequestMapping(method= RequestMethod.GET , value="/hr_contracts/fetchdefault")
public ResponseEntity<List<Hr_contractDTO>> fetchDefault(Hr_contractSearchContext context) {
Page<Hr_contract> domains = hr_contractService.searchDefault(context) ;
......@@ -150,7 +150,7 @@ public class Hr_contractResource {
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Hr_contract-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Hr_contract-Get')")
@ApiOperation(value = "查询数据集", tags = {"Contract" } ,notes = "查询数据集")
@ApiOperation(value = "查询数据集", tags = {"合同" } ,notes = "查询数据集")
@RequestMapping(method= RequestMethod.POST , value="/hr_contracts/searchdefault")
public ResponseEntity<Page<Hr_contractDTO>> searchDefault(@RequestBody Hr_contractSearchContext context) {
Page<Hr_contract> domains = hr_contractService.searchDefault(context) ;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或