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 6e1c0bc..4c0b606 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 @@ -2,6 +2,7 @@ package com.ruoyi.cms.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.entity.Company; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -176,4 +177,13 @@ public class ESJobDocument @ApiModelProperty("岗位特征:(行政、后勤、管理、技术、销售等字典job_feature添加)") private String jobFeature; + + @Excel(name = "专业要求") + private String majorRequire; + + @ApiModelProperty("工作性质") + private String workNature; + + @ApiModelProperty("薪酬类型") + private String salaryType; } 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 97b6bd0..468d2fc 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 @@ -257,6 +257,15 @@ public class Job extends BaseEntity @ApiModelProperty("岗位特征:(行政、后勤、管理、技术、销售等字典job_feature添加)") private String jobFeature; + @Excel(name = "专业要求") + private String majorRequire; + + @ApiModelProperty("工作性质") + private String workNature; + + @ApiModelProperty("薪酬类型") + private String salaryType; + @TableField(exist = false) @ApiModelProperty("户外招聘会岗位审核状态") private String fairReviewStatus; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java index 2c18911..e58f727 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java @@ -43,4 +43,6 @@ public interface CompanyMapper extends BaseMapper List selectMissedOutdoorFairList(@Param("companyId") Long companyId); public List selectCompanyCleanList(CompanySearch company); + + List selectCompanyByNameList(@Param("nameList") List list); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java index df5147b..e393d1a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java @@ -84,4 +84,7 @@ public interface JobMapper extends BaseMapper { //根据企业id批量下架架岗位 public void updateBatchDownStatus(@Param("companyId") Long companyId); + + //根据名称查询企业 + List selectJobByMatchKeyList(@Param("keyList") List list); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/excel/VacancyLongConverter.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/excel/VacancyLongConverter.java index b1acceb..ea571df 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/excel/VacancyLongConverter.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/excel/VacancyLongConverter.java @@ -21,7 +21,15 @@ public class VacancyLongConverter implements Converter { */ @Override public Long convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { - String source = cellData.getStringValue(); + String source = null; + CellDataTypeEnum cellType = cellData.getType(); + if (CellDataTypeEnum.NUMBER.equals(cellType)) { + source = cellData.getNumberValue().toPlainString(); + } else if (CellDataTypeEnum.STRING.equals(cellType)) { + source = cellData.getStringValue(); + } else if (CellDataTypeEnum.BOOLEAN.equals(cellType)) { + source = cellData.getBooleanValue().toString(); + } return extractVacancyNum(source); } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml index b9afc71..5ad35df 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml @@ -395,4 +395,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml index f793cd7..cecaee6 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml @@ -465,4 +465,24 @@ update job set job_status='0', update_time = NOW() where del_flag='0' and company_id=#{companyId} and job_status='1' + +