diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java index 7d8cff3..048dbc8 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java @@ -54,7 +54,7 @@ public class ESJobDocument @ApiModelProperty("用人单位名称") private String companyName; - @ApiModelProperty("工作地点") + @ApiModelProperty("岗位区划") private String jobLocation; @ApiModelProperty("工作地点区县字典代码") @@ -150,6 +150,9 @@ public class ESJobDocument @ApiModelProperty("信用代码") private String code; + @ApiModelProperty("工作地点") + private String jobAddress; + @ApiModelProperty("公司信息") @IndexField(fieldType = FieldType.TEXT) private String companyVoJson; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java index 5a25003..9cade26 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java @@ -59,8 +59,8 @@ public class Job extends BaseEntity @ApiModelProperty("用人单位名称") private String companyName; - @Excel(name = "工作地点") - @ApiModelProperty("工作地点") + @Excel(name = "岗位区划") + @ApiModelProperty("岗位区划") private String jobLocation; @ApiModelProperty("工作地点区县字典代码") @@ -168,6 +168,9 @@ public class Job extends BaseEntity @ApiModelProperty("类型 0常规岗位 1就业见习岗位 2实习实训岗位 3社区实践岗位 4零工 对应字段字典position_type") private String type; + @ApiModelProperty("工作地点") + private String jobAddress; + @TableField(exist = false) @ApiModelProperty("岗位联系人列表") private List jobContactList; diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml index 2bc928a..58c78e8 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml @@ -34,6 +34,7 @@ + @@ -77,6 +78,7 @@ + @@ -95,7 +97,7 @@ - select job_id, job_title, min_salary, max_salary, education, experience, company_name, job_location, posting_date, vacancies, del_flag, create_by, create_time, update_by, update_time, remark, latitude, longitude, "view", company_id , is_hot ,apply_num,is_publish, description,job_location_area_code,data_source,job_url,job_category,is_explain,explain_url,cover,job_type from job + select job_id, job_title, min_salary, max_salary, education, experience, company_name, job_location, posting_date, vacancies, del_flag, create_by, create_time, update_by, update_time, remark, latitude, longitude, "view", company_id , is_hot ,apply_num,is_publish, description,job_location_area_code,data_source,job_url,job_category,is_explain,explain_url,cover,job_type,job_address from job INSERT INTO row_work ( @@ -125,7 +127,7 @@ job_title, min_salary, max_salary, education, experience, company_name, job_location, job_location_area_code, posting_date, vacancies, latitude, longitude, "view", company_id, is_hot, apply_num, description, is_publish, data_source, job_url, remark, del_flag, - create_by, create_time, row_id, job_category,jobType + create_by, create_time, row_id, job_category,jobType,job_address ) VALUES ( @@ -134,7 +136,7 @@ #{job.vacancies}, #{job.latitude}, #{job.longitude}, #{job.view}, #{job.companyId}, #{job.isHot}, #{job.applyNum}, #{job.description}, #{job.isPublish}, #{job.dataSource}, #{job.jobUrl}, #{job.remark}, #{job.delFlag}, #{job.createBy}, #{job.createTime}, - #{job.rowId}, #{job.jobCategory},#{job.jobType} + #{job.rowId}, #{job.jobCategory},#{job.jobType},#{job.jobAddress} )