From 603c33e648a6587fabde99663ebc60e49afd5479 Mon Sep 17 00:00:00 2001 From: sh Date: Tue, 4 Nov 2025 18:42:48 +0800 Subject: [PATCH] =?UTF-8?q?1.pc=E7=AB=AF=E6=B7=BB=E5=8A=A0=E8=B6=B3?= =?UTF-8?q?=E8=BF=B9=E6=8E=A5=E5=8F=A3=202.=E4=BF=AE=E6=94=B9=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=203.es?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B2=97=E4=BD=8D=E5=92=8C=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/controller/app/AppFileController.java | 8 +++--- .../cms/controller/app/AppUserController.java | 21 ++++++++++++++ .../cms/controller/cms/CmsJobController.java | 28 +++++++++++++++++++ .../com/ruoyi/cms/service/IFileService.java | 2 +- .../cms/service/impl/AppUserServiceImpl.java | 2 +- .../cms/service/impl/ESJobSearchImpl.java | 6 ++++ .../cms/service/impl/FileServiceImpl.java | 8 +++--- .../cms/service/impl/JobServiceImpl.java | 2 +- .../main/resources/mapper/app/FileMapper.xml | 6 ++-- .../ruoyi/common/core/domain/entity/File.java | 2 +- 10 files changed, 70 insertions(+), 15 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppFileController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppFileController.java index 2449f1f..3c71426 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppFileController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppFileController.java @@ -2,10 +2,10 @@ package com.ruoyi.cms.controller.app; import com.ruoyi.common.core.domain.entity.File; import com.ruoyi.cms.service.IFileService; -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.page.TableDataInfo; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -17,13 +17,13 @@ import java.util.List; public class AppFileController extends BaseController { @Autowired private IFileService fileService; - @BussinessLog(title = "上传文件") + @ApiOperation("上传文件") @PostMapping("/upload") - public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, @RequestParam(value = "bussinessId",required = false) Long bussinessId) { + public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, @RequestParam(value = "bussinessid",required = false) Long bussinessId) { return fileService.uploadFile(file,bussinessId); } - @BussinessLog(title = "获取附件列表") + @ApiOperation("获取附件列表") @GetMapping("/list") public TableDataInfo list(File file) { diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java index cad8f6f..9035e13 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java @@ -1,5 +1,6 @@ package com.ruoyi.cms.controller.app; +import com.ruoyi.cms.domain.AppReviewJob; import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.common.core.domain.entity.Company; import com.ruoyi.cms.domain.Job; @@ -12,12 +13,15 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.cms.domain.vo.AppUserLky; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SiteSecurityUtils; +import com.ruoyi.common.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.HashMap; import java.util.List; @@ -148,4 +152,21 @@ public class AppUserController extends BaseController AppUserLky appUserLky = appUserService.selectAppUserInfo(appUser); return AjaxResult.success(appUserLky); } + + @PostMapping("/browse") + @ApiOperation("用户浏览") + public AjaxResult browse(@RequestBody AppReviewJob appReviewJob) + { + if(appReviewJob.getJobId()==null){ + return AjaxResult.error("岗位id为空"); + } + if(!SiteSecurityUtils.isLogin()){ + return AjaxResult.error("用户未登录!"); + } + if(StringUtils.isEmpty(appReviewJob.getReviewDate())){ + appReviewJob.setReviewDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date())); + } + appReviewJob.setUserId(SiteSecurityUtils.getUserId()); + return toAjax(appReviewJobService.insertAppReviewJob(appReviewJob)); + } } 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 aac62b5..d4f63aa 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 @@ -17,7 +17,9 @@ 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.DateUtils; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; @@ -28,6 +30,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -286,4 +289,29 @@ public class CmsJobController extends BaseController } return toAjax(jobCollectionService.pcCancel(jobCollection)); } + + @PostMapping("/browse") + @ApiOperation("岗位浏览") + public AjaxResult browse(@RequestBody AppReviewJob appReviewJob) + { + if(appReviewJob.getJobId()==null){ + return AjaxResult.error("岗位id为空"); + } + if(!SecurityUtils.isLogin()){ + return AjaxResult.error("用户未登录!"); + } + if(StringUtils.isEmpty(appReviewJob.getReviewDate())){ + appReviewJob.setReviewDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date())); + } + if(appReviewJob.getUserId()==null){ + String idCard=RoleUtils.getCurrentUseridCard(); + AppUser appUser=appUserService.selectAppuserByIdcard(idCard); + if(appUser==null){ + return AjaxResult.error("用户信息未完善,请完善身份证信息!"); + }else{ + appReviewJob.setUserId(appUser.getUserId()); + } + } + return toAjax(iAppReviewJobService.insertAppReviewJob(appReviewJob)); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileService.java index a24225d..aff4239 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileService.java @@ -54,5 +54,5 @@ public interface IFileService */ public int deleteFileByIds(Long[] ids); - AjaxResult uploadFile(MultipartFile file, Long bussinessId); + AjaxResult uploadFile(MultipartFile file, Long bussinessid); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java index fb98e2f..318e017 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java @@ -267,7 +267,7 @@ public class AppUserServiceImpl extends ServiceImpl imple //查询附件 File fileParm=new File(); - fileParm.setBussinessId(appUser.getUserId()); + fileParm.setBussinessid(appUser.getUserId()); List files=fileMapper.selectFileList(fileParm); appUser.setFileList(files); 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 2ca0aa0..ee73149 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 @@ -431,6 +431,9 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){ wrapper.and(x->x.eq(ESJobDocument::getCode,esJobSearch.getCode())); } + if(!StringUtil.isEmptyOrNull(esJobSearch.getType())){ + wrapper.and(x->x.eq(ESJobDocument::getType,esJobSearch.getType())); + } if(esJobSearch.getJobId()!=null){ wrapper.and(x->x.eq(ESJobDocument::getJobId,esJobSearch.getJobId())); } @@ -509,6 +512,9 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(jobQuery.getCompanyNature())){ wrapper.and(a->a.eq(ESJobDocument::getCompanyNature,jobQuery.getCompanyNature())); } + if(!StringUtil.isEmptyOrNull(jobQuery.getType())){ + wrapper.and(a->a.eq(ESJobDocument::getType,jobQuery.getType())); + } if(Objects.nonNull(jobQuery.getOrder())){ if (jobQuery.getOrder()==2){ wrapper.orderByDesc(ESJobDocument::getPostingDate); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java index 22440bd..90bcd62 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java @@ -91,7 +91,7 @@ public class FileServiceImpl extends ServiceImpl implements IF } @Override - public AjaxResult uploadFile(MultipartFile file, Long bussinessId) { + public AjaxResult uploadFile(MultipartFile file, Long bussinessid) { if (file.isEmpty()) { return AjaxResult.error("文件为空，请选择文件上传"); } @@ -111,7 +111,7 @@ public class FileServiceImpl extends ServiceImpl implements IF Files.copy(file.getInputStream(), filePath); // 保存文件信息到数据库 - saveFileInfo(fileName, bussinessId); + saveFileInfo(fileName, bussinessid); return AjaxResult.success("http://39.98.44.136/file/"+fileName); } catch (IOException e) { @@ -119,10 +119,10 @@ public class FileServiceImpl extends ServiceImpl implements IF return AjaxResult.error("文件上传失败"); } } - private void saveFileInfo(String fileName, Long bussinessId) { + private void saveFileInfo(String fileName, Long bussinessid) { // 这里假设你已经有了一个FileService来处理数据库操作 File file = new File(); - file.setBussinessId(bussinessId); + file.setBussinessid(bussinessid); file.setFileUrl(fileName); this.save(file); } 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 842eb2c..0cd2dfc 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 @@ -217,7 +217,7 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe } //查询附件 File file=new File(); - file.setBussinessId(jobId); + file.setBussinessid(jobId); List filesList=fileMapper.selectFileList(file); if(filesList!=null){ job.setFilesList(filesList); diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml index 0ec4ab4..117dfeb 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml @@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -16,14 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, file_url, bussinessId, del_flag, create_by, create_time, update_by, update_time from file + select id, file_url, bussinessid, del_flag, create_by, create_time, update_by, update_time from file \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java index 0beb02d..e67f28a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java @@ -32,6 +32,6 @@ public class File extends BaseEntity @Excel(name = "业务id") @ApiModelProperty("业务id") - private Long bussinessId; + private Long bussinessid; }