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 048dbc8..e81ad04 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 @@ -153,6 +153,9 @@ public class ESJobDocument @ApiModelProperty("工作地点") private String jobAddress; + @ApiModelProperty("工作地点") + private String regionCode; + @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 771a6ed..1a642a7 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 @@ -172,6 +172,9 @@ public class Job extends BaseEntity @ApiModelProperty("工作地点") private String jobAddress; + @ApiModelProperty("所属行政区划") + private String regionCode; + @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 f5170ab..61dfef6 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 @@ -540,6 +540,9 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(esJobSearch.getJobLocation())){ wrapper.and(x->x.like(ESJobDocument::getJobLocation,esJobSearch.getJobLocation())); } + if(!StringUtil.isEmptyOrNull(esJobSearch.getRegionCode())){ + wrapper.and(x->x.like(ESJobDocument::getRegionCode,esJobSearch.getRegionCode())); + } if(Objects.nonNull(esJobSearch.getOrder())){ if(esJobSearch.getOrder()==1){ wrapper.orderByDesc(ESJobDocument::getIsHot); @@ -635,6 +638,9 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(jobQuery.getJobLocation())){ wrapper.and(x->x.like(ESJobDocument::getJobLocation,jobQuery.getJobLocation())); } + if(!StringUtil.isEmptyOrNull(jobQuery.getRegionCode())){ + wrapper.and(x->x.like(ESJobDocument::getRegionCode,jobQuery.getRegionCode())); + } 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 8abacf2..65a2024 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml @@ -79,6 +79,7 @@ +