From db11d5cb2ac7d829acba172ed02f26830e0df7ec Mon Sep 17 00:00:00 2001 From: sh Date: Sat, 24 Jan 2026 16:22:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=B7=BB=E5=8A=A0=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=B1=BB=E5=9E=8B=EF=BC=88=E6=AE=8B=E7=96=BE=E4=BA=BA?= =?UTF-8?q?=E6=88=96=E8=80=85=E9=80=80=E4=BC=8D=E5=86=9B=E4=BA=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/cms/domain/ESJobDocument.java | 3 +++ .../src/main/java/com/ruoyi/cms/domain/Job.java | 3 +++ .../ruoyi/cms/service/impl/ESJobSearchImpl.java | 6 ++++++ .../src/main/resources/mapper/app/JobMapper.xml | 15 ++++++++++----- 4 files changed, 22 insertions(+), 5 deletions(-) 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 ad37b80..e25122c 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 @@ -156,6 +156,9 @@ public class ESJobDocument @ApiModelProperty("所属行政区划") private String regionCode; + @ApiModelProperty("人员类型 1残疾人,2退伍军人") + private String staffType; + @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 1a642a7..2365547 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 @@ -175,6 +175,9 @@ public class Job extends BaseEntity @ApiModelProperty("所属行政区划") private String regionCode; + @ApiModelProperty("人员类型 1残疾人,2退伍军人") + private String staffType; + @TableField(exist = false) @ApiModelProperty("岗位联系人列表") private List jobContactList; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java index 61dfef6..b8a1ed9 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java @@ -543,6 +543,9 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(esJobSearch.getRegionCode())){ wrapper.and(x->x.like(ESJobDocument::getRegionCode,esJobSearch.getRegionCode())); } + if(!StringUtil.isEmptyOrNull(esJobSearch.getStaffType())){ + wrapper.and(x->x.like(ESJobDocument::getStaffType,esJobSearch.getStaffType())); + } if(Objects.nonNull(esJobSearch.getOrder())){ if(esJobSearch.getOrder()==1){ wrapper.orderByDesc(ESJobDocument::getIsHot); @@ -641,6 +644,9 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(jobQuery.getRegionCode())){ wrapper.and(x->x.like(ESJobDocument::getRegionCode,jobQuery.getRegionCode())); } + if(!StringUtil.isEmptyOrNull(jobQuery.getStaffType())){ + wrapper.and(x->x.like(ESJobDocument::getStaffType,jobQuery.getStaffType())); + } if(Objects.nonNull(jobQuery.getOrder())){ if (jobQuery.getOrder()==2){ wrapper.orderByDesc(ESJobDocument::getPostingDate); diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml index 65a2024..b50f981 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml @@ -35,6 +35,8 @@ + + @@ -80,6 +82,7 @@ + @@ -98,7 +101,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,job_address 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,region_code,staff_type from job INSERT INTO row_work ( @@ -128,7 +131,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,job_type,type,job_address + create_by, create_time, row_id, job_category,job_type,type,job_address,region_code,staff_type ) VALUES ( @@ -137,7 +140,8 @@ #{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.type},#{job.jobAddress} + #{job.rowId}, #{job.jobCategory},#{job.jobType},#{job.type},#{job.jobAddress}, + #{job.regionCode},#{job.staffType} ) @@ -355,7 +359,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,job_type,type,job_address + create_by, create_time, row_id, job_category,job_type,type,job_address,region_code,staff_type ) VALUES ( @@ -364,7 +368,8 @@ #{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.type},#{job.jobAddress} + #{job.rowId}, #{job.jobCategory},#{job.jobType},#{job.type},#{job.jobAddress}, + #{job.regionCode},#{job.staffType} )