diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java index a0683ba..1cbb402 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java @@ -12,7 +12,6 @@ import com.ruoyi.cms.util.sensitiveWord.SensitiveWordChecker; import com.ruoyi.common.annotation.BussinessLog; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.Company; import com.ruoyi.common.core.page.TableDataInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 岗位Controller @@ -77,8 +75,7 @@ public class AppJobController extends BaseController public AjaxResult recommend(ESJobSearch esJobSearch) { if (RoleUtils.getAppCurrentUseridCard() != null) { - Company company = companyService.queryCodeCompany(RoleUtils.getAppCurrentUseridCard()); - esJobSearch.setCompanyId(Objects.nonNull(company) ? company.getCompanyId() : null); + esJobSearch.setCode(RoleUtils.getAppCurrentUseridCard()); } List jobList = jobService.recommend(esJobSearch); return success(jobList); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java index b9d09d5..2c810f2 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/JobApplyController.java @@ -4,9 +4,13 @@ import com.ruoyi.cms.domain.Job; import com.ruoyi.cms.domain.JobApply; import com.ruoyi.cms.domain.vo.CandidateVO; import com.ruoyi.cms.service.IJobApplyService; +import com.ruoyi.cms.util.RoleUtils; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.AppUser; +import com.ruoyi.common.core.domain.entity.Company; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; @@ -47,4 +51,18 @@ public class JobApplyController extends BaseController { ExcelUtil util = new ExcelUtil(CandidateVO.class); util.exportExcel(response, list, "APP用户数据"); } + + @ApiOperation("获取求职者列表") + @PreAuthorize("@ss.hasPermi('cms:jobApply:applyJobUserList')") + @GetMapping("/applyJobUserList") + public TableDataInfo applyJobList(AppUser appUser) + { + if (RoleUtils.isCompanyAdmin()) { + Company company=new Company(); + company.setCode(RoleUtils.getCurrentUseridCard()); + } + startPage(); + List list = iJobApplyService.selectApplyJobUserList(appUser); + return getDataTable(list); + } } 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 fe63a98..53c25dd 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 @@ -146,4 +146,7 @@ public class ESJobDocument @ApiModelProperty("类型 0常规岗位 1就业见习岗位 2实习实训岗位 3社区实践岗位 对应字段字典position_type") private String type; + + @ApiModelProperty("信用代码") + private String code; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java index 5dbfdb7..26ea3fb 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java @@ -8,6 +8,7 @@ import java.util.List; import com.ruoyi.cms.domain.Job; import com.ruoyi.cms.domain.JobApply; import com.ruoyi.cms.domain.vo.CandidateVO; +import com.ruoyi.common.core.domain.entity.AppUser; /** * 岗位申请Mapper接口 @@ -32,4 +33,6 @@ public interface JobApplyMapper extends BaseMapper HashMap trendChart(JobApply jobApply); List selectAppUserList(Job job); + + List selectApplyJobUserList(AppUser appUser); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java index a6e2ad9..b2b7a99 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java @@ -6,6 +6,7 @@ import java.util.List; import com.ruoyi.cms.domain.Job; import com.ruoyi.cms.domain.JobApply; import com.ruoyi.cms.domain.vo.CandidateVO; +import com.ruoyi.common.core.domain.entity.AppUser; /** * 岗位申请Service接口 @@ -62,4 +63,6 @@ public interface IJobApplyService HashMap trendChart(JobApply jobApply); List selectAppUserList(Job job); + + List selectApplyJobUserList(AppUser appUser); } 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 38efb8b..ed527e1 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 @@ -184,8 +184,8 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(esJobSearch.getCompanyNature())){ newSearch.setCompanyNature(esJobSearch.getCompanyNature()); } - if(esJobSearch.getCompanyId()!=null){ - newSearch.setCompanyId(esJobSearch.getCompanyId()); + if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){ + newSearch.setCode(esJobSearch.getCode()); } } @@ -420,8 +420,8 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(esJobSearch.getCompanyNature())){ wrapper.and(x->x.eq(ESJobDocument::getCompanyNature,esJobSearch.getCompanyNature())); } - if(esJobSearch.getCompanyId()!=null){ - wrapper.and(x->x.eq(ESJobDocument::getCompanyId,esJobSearch.getCompanyId())); + if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){ + wrapper.and(x->x.eq(ESJobDocument::getCode,esJobSearch.getCode())); } if(Objects.nonNull(esJobSearch.getOrder())){ if(esJobSearch.getOrder()==1){ diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java index 999a2c0..6465d07 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.cms.domain.query.MineJobQuery; import com.ruoyi.cms.domain.vo.CandidateVO; import com.ruoyi.cms.mapper.*; import com.ruoyi.cms.service.IJobApplyService; +import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.common.utils.SiteSecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -127,4 +128,9 @@ public class JobApplyServiceImpl extends ServiceImpl im public List selectAppUserList(Job job) { return jobApplyMapper.selectAppUserList(job); } + + @Override + public List selectApplyJobUserList(AppUser appUser) { + return jobApplyMapper.selectApplyJobUserList(appUser); + } } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml index 7bec3d9..8e80d17 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml @@ -101,4 +101,19 @@ + + \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml index 6ab4653..9ab5d4c 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml @@ -215,7 +215,7 @@ )