更新后台查看企业职位和企业简历

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/JobAdvertisedController.java

@@ -59,7 +59,7 @@ public class JobAdvertisedController {
     @Operation(summary = "获得招聘职位分页")
     @PreAuthorize("@ss.hasPermission('menduner:system:job-advertised:query')")
     public CommonResult<PageResult<JobAdvertisedRespVO>> getJobAdvertisedPage(@Valid JobAdvertisedPageReqVO pageReqVO) {
-        PageResult<JobAdvertisedDO> pageResult = jobAdvertisedService.getJobAdvertisedPage(pageReqVO);
+        PageResult<JobAdvertisedRespVO> pageResult = jobAdvertisedService.getJobAdvertisedPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, JobAdvertisedRespVO.class));
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/job/JobAdvertisedPageReqVO.java

@@ -53,4 +53,7 @@ public class JobAdvertisedPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "招聘会id", example = "29465")
+    private Long fairId;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/job/JobAdvertisedRespVO.java

@@ -1,10 +1,13 @@
 package com.citu.module.menduner.system.controller.base.job;
 
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.citu.framework.excel.core.annotations.DictFormat;
 import com.citu.framework.excel.core.convert.DictConvert;
+import com.citu.module.menduner.system.controller.base.fair.JobFairRespVO;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -136,4 +139,12 @@ public class JobAdvertisedRespVO {
     @ExcelProperty("更新时间")
     private LocalDateTime updateTime;
 
+    @Schema(description = "招聘会名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("招聘会名称")
+    private String jobFairName;
+
+    @Schema(description = "招聘会信息", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelIgnore
+    private JobFairRespVO jobFairRespVO;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/job/cv/JobCvRelDetailRespVO.java

@@ -1,5 +1,6 @@
 package com.citu.module.menduner.system.controller.base.job.cv;
 
+import com.citu.module.menduner.system.controller.base.fair.JobFairRespVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedDetailRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -14,5 +15,7 @@ public class JobCvRelDetailRespVO extends JobAdvertisedDetailRespVO {
     @Schema(description = "实习的企业")
     private Boolean internshipEnterprise=false;
 
+    @Schema(description = "招聘会")
+    private JobFairRespVO jobFair;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/job/cv/JobCvRelPageReqVO.java

@@ -41,8 +41,8 @@ public class JobCvRelPageReqVO extends PageParam {
     @Schema(description = "投递的简历状态", example = "2")
     private String status;
 
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
+//    @Schema(description = "创建时间")
+//    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+//    private LocalDateTime[] createTime;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobAdvertisedMapper.java

@@ -20,11 +20,9 @@ import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJ
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitAnalysisPageReqVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitJobAnalysisRespVO;
-import com.citu.module.menduner.system.controller.base.job.JobAdvertisedDetailRespVO;
-import com.citu.module.menduner.system.controller.base.job.JobAdvertisedPageReqVO;
-import com.citu.module.menduner.system.controller.base.job.JobAdvertisedReqVO;
-import com.citu.module.menduner.system.controller.base.job.JobAdvertisedSimpleRespVO;
+import com.citu.module.menduner.system.controller.base.job.*;
 import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelDetailRespVO;
+import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
@@ -57,9 +55,15 @@ import java.util.Map;
 @Mapper
 public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
 
-    default PageResult<JobAdvertisedDO> selectPage(JobAdvertisedPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<JobAdvertisedDO>()
-                .inIfPresent(JobAdvertisedDO::getId, reqVO.getId())
+    default PageResult<JobAdvertisedRespVO> selectPage(JobAdvertisedPageReqVO reqVO) {
+
+        MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
+        query.selectAll(JobAdvertisedDO.class);
+        query.selectAssociation(FairDO.class,JobAdvertisedRespVO::getJobFairRespVO);
+        query.selectAs(FairDO::getTitle, JobAdvertisedRespVO::getJobFairName);
+        query.leftJoin(FairDO.class,on->on.eq(JobAdvertisedDO::getFairId, FairDO::getId).eq(JobAdvertisedDO::getJoinFairStatus,JobJoinFairStatus.JOIN_FAIR_JOB.getStatus()));
+        query.eq(null!=reqVO.getFairId() && reqVO.getFairId()>0,FairDO::getId,reqVO.getFairId());
+            query.inIfPresent(JobAdvertisedDO::getId, reqVO.getId())
                 .eqIfPresent(JobAdvertisedDO::getEnterpriseId, reqVO.getEnterpriseId())
                 .eqIfPresent(JobAdvertisedDO::getUserId, reqVO.getUserId())
                 .eqIfPresent(JobAdvertisedDO::getAreaId, reqVO.getAreaId())
@@ -71,7 +75,11 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
                 .eqIfPresent(JobAdvertisedDO::getHire, reqVO.isHire())
                 .eqIfPresent(JobAdvertisedDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(JobAdvertisedDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(JobAdvertisedDO::getUpdateTime));
+                .orderByDesc(JobAdvertisedDO::getUpdateTime);
+
+
+
+        return selectJoinPage(reqVO,JobAdvertisedRespVO.class ,query);
     }
 
     default List<JobAdvertisedDO> selectListByIds(List<Long> ids) {
@@ -281,18 +289,26 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
     /**
      * 根据用户id 查询投递的职位信息
      **/
-    default PageResult<JobCvRelDetailRespVO> selectCvRelJobPage(PageParam pageParam, Long userId) {
+    default PageResult<JobCvRelDetailRespVO> selectCvRelJobPage(JobCvRelPageReqVO reqVO, Long userId) {
         MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
         query.selectAssociation(JobAdvertisedDO.class, JobCvRelDetailRespVO::getJob);
         query.selectAssociation(EnterpriseDO.class, JobCvRelDetailRespVO::getEnterprise);
         query.selectAssociation(JobCvRelDO.class, JobCvRelDetailRespVO::getCvRel);
-
+        query.selectAssociation(FairDO.class, JobCvRelDetailRespVO::getJobFair);
         query.innerJoin(JobCvRelDO.class, JobCvRelDO::getJobId, JobAdvertisedDO::getId);
         query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, JobAdvertisedDO::getEnterpriseId);
+        query.leftJoin(JobCvRelDO.class, JobCvRelDO::getJobFairId, FairDO::getId);
         query.eq(JobCvRelDO::getUserId, userId);
-
+        query.eq(null!=reqVO.getEnterpriseId(), JobAdvertisedDO::getEnterpriseId, reqVO.getEnterpriseId());
+        query.eq(null!=reqVO.getJobId(), JobAdvertisedDO::getId, reqVO.getJobId());
+        query.eq(null!=reqVO.getStatus(), JobCvRelDO::getStatus, reqVO.getStatus());
+        query.eq(null!=reqVO.getType(), JobCvRelDO::getType, reqVO.getType());
+        query.eq(null!=reqVO.getRecommendUserId(), JobCvRelDO::getRecommendUserId, reqVO.getRecommendUserId());
+//        query.eq(null!=reqVO.getCreateTime(), JobCvRelDO::getCreateTime, reqVO.getCreateTime());
+        query.eq(null!=reqVO.getPublishUserId(), JobCvRelDO::getPublishUserId, reqVO.getPublishUserId());
+        query.eq(null!=reqVO.getJobFairId(), JobCvRelDO::getJobFairId, reqVO.getJobFairId());
         query.orderByDesc(JobAdvertisedDO::getUpdateTime);
-        return selectJoinPage(pageParam, JobCvRelDetailRespVO.class, query);
+        return selectJoinPage(reqVO, JobCvRelDetailRespVO.class, query);
     }
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedService.java

@@ -13,10 +13,7 @@ import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJ
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitAnalysisPageReqVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitJobAnalysisRespVO;
-import com.citu.module.menduner.system.controller.base.job.JobAdvertisedPageReqVO;
-import com.citu.module.menduner.system.controller.base.job.JobAdvertisedRenewalReqVO;
-import com.citu.module.menduner.system.controller.base.job.JobAdvertisedReqVO;
-import com.citu.module.menduner.system.controller.base.job.JobAdvertisedSaveReqVO;
+import com.citu.module.menduner.system.controller.base.job.*;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 
 import javax.validation.Valid;
@@ -68,7 +65,7 @@ public interface JobAdvertisedService {
      * @param pageReqVO 分页查询
      * @return 招聘职位分页
      */
-    PageResult<JobAdvertisedDO> getJobAdvertisedPage(JobAdvertisedPageReqVO pageReqVO);
+    PageResult<JobAdvertisedRespVO> getJobAdvertisedPage(JobAdvertisedPageReqVO pageReqVO);
 
     /**
      * 获得全员猎聘职位分页
@@ -76,7 +73,7 @@ public interface JobAdvertisedService {
      * @param page 分页查询
      * @return 招聘职位分页
      */
-    PageResult<JobAdvertisedDO> getHireJobPage(JobAdvertisedPageReqVO page);
+    PageResult<JobAdvertisedRespVO> getHireJobPage(JobAdvertisedPageReqVO page);
 
     /**
      * 获得招聘职位列表

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -146,12 +146,12 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     }
 
     @Override
-    public PageResult<JobAdvertisedDO> getJobAdvertisedPage(JobAdvertisedPageReqVO pageReqVO) {
+    public PageResult<JobAdvertisedRespVO> getJobAdvertisedPage(JobAdvertisedPageReqVO pageReqVO) {
         return mapper.selectPage(pageReqVO);
     }
 
     @Override
-    public PageResult<JobAdvertisedDO> getHireJobPage(JobAdvertisedPageReqVO page) {
+    public PageResult<JobAdvertisedRespVO> getHireJobPage(JobAdvertisedPageReqVO page) {
         page.setEnterpriseId(DEFAULT_ENTERPRISE_ID);
         page.setUserId(DEFAULT_USER_ID);
         return mapper.selectPage(page);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationService.java

@@ -20,6 +20,7 @@ import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseB
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedDetailRespVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedImportExcelVO;
 import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelDetailRespVO;
+import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelPageReqVO;
 
 import java.util.List;
 
@@ -38,7 +39,7 @@ public interface JobIntegrationService {
      *
      * @param page 分页
      */
-    PageResult<JobCvRelDetailRespVO> getJobCvPage(PageParam page, Long userId);
+    PageResult<JobCvRelDetailRespVO> getJobCvPage(JobCvRelPageReqVO page, Long userId);
 
     /**
      * 获取收藏的招聘职位分页

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationServiceImpl.java

@@ -24,6 +24,7 @@ import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseB
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedDetailRespVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedImportExcelVO;
 import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelDetailRespVO;
+import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelPageReqVO;
 import com.citu.module.menduner.system.controller.base.person.student.StudentRespVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
@@ -127,7 +128,7 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
 
 
     @Override
-    public PageResult<JobCvRelDetailRespVO> getJobCvPage(PageParam page, Long userId) {
+    public PageResult<JobCvRelDetailRespVO> getJobCvPage(JobCvRelPageReqVO page, Long userId) {
         List<StudentRespVO> studentInfoByUserIds = studentService.getStudentInfoByUserIds(Arrays.asList(userId));
         StudentRespVO studentRespVO = null;
         if(null!=studentInfoByUserIds && !studentInfoByUserIds.isEmpty()){