From ac2d427a7196faaa95b1d77955558310e1422ec2 Mon Sep 17 00:00:00 2001 From: sh Date: Thu, 16 Oct 2025 14:55:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D-=E6=B7=BB=E5=8A=A0=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E7=B1=BB=E5=9E=8B=EF=BC=880=E5=B8=B8=E8=A7=84?= =?UTF-8?q?=E5=B2=97=E4=BD=8D=201=E5=B0=B1=E4=B8=9A=E8=A7=81=E4=B9=A0?= =?UTF-8?q?=E5=B2=97=E4=BD=8D=202=E5=AE=9E=E4=B9=A0=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E5=B2=97=E4=BD=8D=203=E7=A4=BE=E5=8C=BA=E5=AE=9E=E8=B7=B5?= =?UTF-8?q?=E5=B2=97=E4=BD=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/cms/domain/ESJobDocument.java | 3 +++ ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java | 3 +++ .../java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java | 6 ++++++ .../java/com/ruoyi/common/core/domain/entity/AppUser.java | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) 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 4f777d6..7fed79f 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 @@ -142,4 +142,7 @@ public class ESJobDocument @ApiModelProperty("岗位类型 0疆内 1疆外") private String jobType; + + @ApiModelProperty("类型 0常规岗位 1就业见习岗位 2实习实训岗位 3社区实践岗位 对应字段字典position_type") + private String type; } 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 cb5e47a..5910510 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 @@ -162,6 +162,9 @@ public class Job extends BaseEntity @ApiModelProperty("岗位类型 0疆内 1疆外") private String jobType; + @ApiModelProperty("类型 0常规岗位 1就业见习岗位 2实习实训岗位 3社区实践岗位 对应字段字典position_type") + private String type; + @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 cc142ef..e981a63 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 @@ -175,6 +175,9 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(esJobSearch.getJobType())){ newSearch.setJobType(esJobSearch.getJobType()); } + if(!StringUtil.isEmptyOrNull(esJobSearch.getType())){ + newSearch.setType(esJobSearch.getType()); + } } LambdaEsQueryWrapper wrapper = getWrapper(newSearch,jobIds); @@ -399,6 +402,9 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(esJobSearch.getJobType())){ wrapper.and(x->x.eq(ESJobDocument::getJobType,esJobSearch.getJobType())); } + if(!StringUtil.isEmptyOrNull(esJobSearch.getType())){ + wrapper.and(x->x.eq(ESJobDocument::getType,esJobSearch.getType())); + } if(Objects.nonNull(esJobSearch.getOrder())){ if(esJobSearch.getOrder()==1){ wrapper.orderByDesc(ESJobDocument::getIsHot); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java index e93a110..2252586 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java @@ -107,7 +107,7 @@ public class AppUser extends BaseEntity /** * 是否企业用户 0是，1否改为（0企业，1求职者，2网格员） */ - @ApiModelProperty("app角色：0企业，1求职者，2网格员") + @ApiModelProperty("app角色：0企业，1求职者，2网格员 3内部政府人员") private String isCompanyUser; @TableField(exist = false)