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 0f1b934..d7b6242 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 @@ -552,4 +552,14 @@ public class CmsJobController extends BaseController } return null; } + + @ApiOperation("查询石河子本地上传岗位列表") + @PreAuthorize("@ss.hasPermi('cms:job:searchLocalJob')") + @GetMapping("/searchLocalJob") + public TableDataInfo searchLocalJob(JobSearch job) + { + startPage(); + List list = jobService.selectLocalExcelJobList(job); + return getDataTable(list); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobExcelImportRecordDetail.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobExcelImportRecordDetail.java new file mode 100644 index 0000000..251096e --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobExcelImportRecordDetail.java @@ -0,0 +1,29 @@ +package com.ruoyi.cms.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 石河子岗位数据入库监测记录 shz.job_excel_import_record + */ +@Data +@ApiModel("石河子岗位数据入库监测记录明细") +@TableName("job_excel_import_record_detail") +public class JobExcelImportRecordDetail extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 监测主键ID */ + @Excel(name = "监测主键ID") + @ApiModelProperty("监测主键ID") + private String detectionId; + + /** 原始文件名称 */ + @Excel(name = "岗位id") + @ApiModelProperty("岗位id") + private String jobId; +} \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobExcelImportRecordDetailMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobExcelImportRecordDetailMapper.java new file mode 100644 index 0000000..25f46e8 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobExcelImportRecordDetailMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.cms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.cms.domain.JobExcelImportRecordDetail; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 石河子岗位数据入库监测记录Mapper + */ +public interface JobExcelImportRecordDetailMapper extends BaseMapper { + + void batchInsert(@Param("detectionId") String detectionId, @Param("ids") List ids); +} \ No newline at end of file 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 e393d1a..1f646ba 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 @@ -87,4 +87,6 @@ public interface JobMapper extends BaseMapper { //根据名称查询企业 List selectJobByMatchKeyList(@Param("keyList") List list); + + List selectLocalExcelJobList(JobSearch job); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobService.java index 08a5fab..99757d5 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobService.java @@ -124,4 +124,6 @@ public interface IJobService public int jobUp(Long jobId); void updateLonToByIds(List ids); + + List selectLocalExcelJobList(JobSearch job); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobExcelImportRecordServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobExcelImportRecordServiceImpl.java index c7dedb2..146b2e6 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobExcelImportRecordServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobExcelImportRecordServiceImpl.java @@ -16,6 +16,7 @@ import com.ruoyi.cms.domain.query.CompanySearch; import com.ruoyi.cms.domain.vo.ContactParseResult; import com.ruoyi.cms.domain.vo.JobShzLocalExcelVo; import com.ruoyi.cms.mapper.CompanyMapper; +import com.ruoyi.cms.mapper.JobExcelImportRecordDetailMapper; import com.ruoyi.cms.mapper.JobExcelImportRecordMapper; import com.ruoyi.cms.mapper.JobMapper; import com.ruoyi.cms.service.*; @@ -52,7 +53,7 @@ public class JobExcelImportRecordServiceImpl extends ServiceImpl selectShzJobExcelImportRecordList(JobExcelImportRecord jobExcelImportRecord) { @@ -258,6 +259,11 @@ public class JobExcelImportRecordServiceImpl extends ServiceImpl implements IJobSe iesJobSearchService.updateJob(jobId); return i; } + + @Override + public List selectLocalExcelJobList(JobSearch job){ + return jobMapper.selectLocalExcelJobList(job); + } } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobExcelImportRecordDeatilMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobExcelImportRecordDeatilMapper.xml new file mode 100644 index 0000000..de021a8 --- /dev/null +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobExcelImportRecordDeatilMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + select detection_id, + job_id, + del_flag, + create_by, + create_time, + update_by, + update_time, + remark + from job_excel_import_record_detail + + + + INSERT INTO job_excel_import_record_detail ( + detection_id, job_id, create_time, del_flag + ) VALUES + + ( + #{detectionId}, #{jobId}, NOW(), '0' + ) + + + + + diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml index 6ab615c..526c905 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml @@ -228,7 +228,6 @@ and apply_num = #{applyNum} and company_id in(select company_id from company where code=#{code}) and job_status = #{jobStatus} - and (create_by = #{createBy} or update_by = #{createBy}) and min_salary < 1750 @@ -486,4 +485,28 @@ + + + + select t.job_id, job_title, min_salary, max_salary, salary_composition, welfare_benefits, + work_schedule, education, experience, company_name, job_location, posting_date, vacancies, + t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, t.remark, latitude, longitude, "view", + company_id, is_hot, is_urgent, apply_num, is_publish, description, job_location_area_code, + data_source, external_source_code, external_source_name, job_url, job_category, is_explain, explain_url, cover, job_type, job_address, + review_status, is_key_populations, key_populations + from job t + +