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 3dd9e10..69e6a80 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 @@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Date; @@ -66,14 +67,15 @@ public class CmsJobController extends BaseController @ApiOperation("查询岗位列表") // @PreAuthorize("@ss.hasPermi('cms:job:list')") @GetMapping("/list") - public TableDataInfo list(Job job) + public TableDataInfo list(Job job,HttpServletRequest request) { if (RoleUtils.isCompanyAdmin()) { Company company = companyService.queryCodeCompany(RoleUtils.getCurrentUseridCard()); job.setCompanyId(Objects.nonNull(company) ? company.getCompanyId() : null); } startPage(); - List list = jobService.selectJobList(job); + //List list = jobService.selectJobList(job); + List list = jobService.selectHttpJobList(job,request); return getDataTable(list); } @@ -83,9 +85,10 @@ public class CmsJobController extends BaseController @ApiOperation("获取岗位详细信息") // @PreAuthorize("@ss.hasPermi('bussiness:job:query')") @GetMapping(value = "/{jobId}") - public AjaxResult getInfo(@PathVariable("jobId") Long jobId) + public AjaxResult getInfo(@PathVariable("jobId") Long jobId, HttpServletRequest request) { - return success(jobService.selectJobByJobId(jobId)); + //return success(jobService.selectJobByJobId(jobId)); + return success(jobService.selectHttpJobByJobId(jobId,request)); } /** diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileMapper.java index 181c211..b4bdf13 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileMapper.java @@ -24,4 +24,6 @@ public interface FileMapper extends BaseMapper public int updateBussinessids(@Param("longs") List longs,@Param("newBussinessid") Long bussinessid); public List selectFileListByBussinessIds(@Param("longs") List longs); + + public int updateIds(@Param("longs") List longs,@Param("newBussinessid") Long bussinessid); } 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 e48c516..d8881a3 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 @@ -6,10 +6,11 @@ import com.ruoyi.cms.domain.ESJobDocument; import com.ruoyi.cms.domain.Job; import com.ruoyi.cms.domain.query.ESJobSearch; import com.ruoyi.cms.domain.vo.CandidateVO; -import com.ruoyi.cms.util.AppWechatEntity; import com.ruoyi.common.core.domain.entity.AppUser; import org.dromara.easyes.core.biz.EsPageInfo; +import javax.servlet.http.HttpServletRequest; + /** * 岗位Service接口 * @@ -96,4 +97,8 @@ public interface IJobService List sysRecommend(ESJobSearch esJobSearch); List selectAllJob(); + + public Job selectHttpJobByJobId(Long jobId, HttpServletRequest request); + + public List selectHttpJobList(Job job,HttpServletRequest request); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java index dfb59c2..f22bc14 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java @@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; import java.io.*; import java.math.BigDecimal; import java.net.HttpURLConnection; @@ -211,6 +212,25 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe */ @Override public Job selectJobByJobId(Long jobId) + { + Job job = jobMapper.selectById(jobId); + //查询公司信息 + if(Objects.nonNull(job.getCompanyId())){ + Company company = companyMapper.selectById(job.getCompanyId()); + job.setCompany(company); + } + //查询联系人 + JobContact contact=new JobContact(); + contact.setJobId(job.getJobId()); + List contacts=jobContactMapper.getSelectList(contact); + if(contacts!=null){ + job.setJobContactList(contacts); + } + return job; + } + + @Override + public Job selectHttpJobByJobId(Long jobId, HttpServletRequest request) { Job job = jobMapper.selectById(jobId); //查询公司信息 @@ -226,7 +246,7 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe job.setJobContactList(contacts); } //查询附件 - String baseFilePath = StringUtil.getFilePath(); + String baseFilePath = StringUtil.getFilePath(request); //查询附件 File queryFile = new File(); queryFile.setBussinessid(jobId); @@ -252,10 +272,17 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe */ @Override public List selectJobList(Job job) + { + List jobs = jobMapper.selectJobList(job); + return jobs; + } + + @Override + public List selectHttpJobList(Job job,HttpServletRequest request) { List jobs = jobMapper.selectJobList(job); if (CollectionUtils.isNotEmpty(jobs)) { - String baseFilePath = StringUtil.getFilePath(); + String baseFilePath = StringUtil.getFilePath(request); List jobIds = jobs.stream().filter(Objects::nonNull) .map(Job::getJobId).filter(Objects::nonNull) @@ -395,7 +422,7 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe } //添加附件 List filesList = job.getFilesList() != null ? job.getFilesList() : Collections.emptyList(); - List longs = filesList.stream().filter(Objects::nonNull).filter(file -> Objects.isNull(file.getId())).map(File::getBussinessid).collect(Collectors.toList()); + List longs = filesList.stream().filter(Objects::nonNull).map(File::getBussinessid).collect(Collectors.toList()); if(!longs.isEmpty()){ fileMapper.updateBussinessids(longs,job.getJobId()); } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml index a6db6c0..29c3320 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml @@ -62,4 +62,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update file + + set bussinessid = #{newBussinessid} + + + set bussinessid = bussinessid + where 1 = 2 + + where + + id in ( + + #{oldId} + + ) + + + 1 = 2 + + + \ No newline at end of file