diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java index df4d17f..fd6c677 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java @@ -401,6 +401,7 @@ public class CmsJobController extends BaseController * @throws Exception */ @PostMapping("/downloadModel") + @ApiOperation("岗位批量上传模板下载") public void downloadModel(HttpServletRequest request, HttpServletResponse response)throws Exception{ String name = "模板.xlsx"; String pathFile="/data/downloadmodel/"+name; 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 e25122c..931c312 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 @@ -162,4 +162,13 @@ public class ESJobDocument @ApiModelProperty("公司信息") @IndexField(fieldType = FieldType.TEXT) private String companyVoJson; + + @ApiModelProperty("是否发布 0未发布 1发布") + private Integer isPublish; + + @ApiModelProperty("是否通过 0通过,1不通过") + private String pass; + + @ApiModelProperty("是否通过原因") + private String passReason; } 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 2365547..90b1961 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 @@ -198,4 +198,10 @@ public class Job extends BaseEntity @TableField(exist = false) @ApiModelProperty("申请人列表") private List applyUsers; + + @ApiModelProperty("是否通过 0通过,1不通过") + private String pass; + + @ApiModelProperty("是否通过原因") + private String passReason; } 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 b8a1ed9..eacfeff 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 @@ -239,7 +239,7 @@ public class ESJobSearchImpl implements IESJobSearchService int pageSize = esJobSearch.getPageSize() == null ? 10 : esJobSearch.getPageSize(); pageSize = Math.min(pageSize, 50); // 限制最大条数 int from = current * pageSize; - wrapper.orderByAsc(ESJobDocument::getId); + wrapper.orderByAsc(ESJobDocument::getIsPublish);//按照未发布放最上面 wrapper.limit(from, pageSize); }else{ wrapper.limit(esJobSearch.getPageSize()); diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml index b50f981..5ccf988 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml @@ -37,6 +37,8 @@ + + @@ -83,6 +85,8 @@ + + @@ -101,7 +105,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,region_code,staff_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,region_code,staff_type,pass,pass_reason from job INSERT INTO row_work ( @@ -131,7 +135,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,region_code,staff_type + create_by, create_time, row_id, job_category,job_type,type,job_address,region_code,staff_type,pass,pass_reason ) VALUES ( @@ -141,7 +145,7 @@ #{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.regionCode},#{job.staffType} + #{job.regionCode},#{job.staffType},#{job.pass},#{job.passReason} ) @@ -359,7 +363,8 @@ 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,region_code,staff_type + create_by, create_time, row_id, job_category,job_type,type,job_address,region_code, + staff_type,pass,pass_reason ) VALUES ( @@ -369,7 +374,7 @@ #{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.regionCode},#{job.staffType} + #{job.regionCode},#{job.staffType},#{job.pass},#{job.passReason} )