1、丰富企业招聘会的字段

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/fair/AppFairController.java

@@ -41,7 +41,6 @@ public class AppFairController {
         return success(BeanUtils.toBean(fairService.getJobFair(id), JobFairRespVO.class));
     }
 
-
     @GetMapping("/enterprise/page")
     @Operation(summary = "招聘会企业分页查询")
     public CommonResult<PageResult<JobFairEnterpriseRespVO>> getJobFairEnterprisePage(

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/JobFairEnterprisePageReqVO.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.util.List;
+
 @Schema(description = " 招聘会企业分页查询 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -18,4 +20,7 @@ public class JobFairEnterprisePageReqVO extends PageParam {
     @Schema(description = "企业关键字")
     private String keyword;
 
+    @Schema(description = "行业类型id")
+    private List<Long> industryId;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/JobFairJobInfoPageReqVO.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.util.List;
+
 @Schema(description = " 招聘会企业职位分页查询 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -21,4 +23,7 @@ public class JobFairJobInfoPageReqVO extends PageParam {
     @Schema(description = "关键字")
     private String keyword;
 
+    @Schema(description = "职位类型id")
+    private List<Long> positionId;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/JobFairJobInfoRespVO.java

@@ -1,5 +1,6 @@
 package com.citu.module.menduner.system.controller.base.fair;
 
+import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseRespVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedSimpleRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -10,4 +11,7 @@ public class JobFairJobInfoRespVO extends JobAdvertisedSimpleRespVO {
 
     @Schema(description = "招聘会id")
     private Long jobFairId;
+
+    @Schema(description = "招聘会企业")
+    private EnterpriseRespVO enterprise;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/JobFairPageReqVO.java

@@ -1,7 +1,6 @@
 package com.citu.module.menduner.system.controller.base.fair;
 
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.citu.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -20,6 +19,10 @@ import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DA
 @ToString(callSuper = true)
 public class JobFairPageReqVO extends PageParam {
 
+
+    @Schema(description = "类别（0企业|1职位|2企业-职位）", example = "0")
+    private String category;
+
     @Schema(description = "类型", example = "1")
     private String type;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/JobFairRespVO.java

@@ -3,6 +3,7 @@ package com.citu.module.menduner.system.controller.base.fair;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairTagContent;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -22,6 +23,13 @@ public class JobFairRespVO {
     @ExcelProperty("类型")
     private String type;
 
+    @Schema(description = "类别（0企业|1职位|2企业-职位）", example = "0")
+    @ExcelProperty("类别（0企业|1职位|2企业-职位）")
+    private String category;
+
+    @Schema(description = "自定义标签", example = "0")
+    private List<FairTagContent> tag;
+
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("标题")
     private String title;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/JobFairSaveReqVO.java

@@ -1,7 +1,7 @@
 package com.citu.module.menduner.system.controller.base.fair;
 
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairTagContent;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -21,6 +21,12 @@ public class JobFairSaveReqVO {
     @NotEmpty(message = "类型不能为空")
     private String type;
 
+    @Schema(description = "类别（0企业|1职位|2企业-职位）", example = "0")
+    private String category;
+
+    @Schema(description = "自定义标签", example = "0")
+    private List<FairTagContent> tag;
+
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "标题不能为空")
     private String title;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/fair/FairDO.java

@@ -36,6 +36,15 @@ public class FairDO extends TenantBaseDO {
      * 类型
      */
     private String type;
+    /**
+     * 类别（0企业|1职位|2企业-职位）
+     */
+    private String category;
+    /**
+     * 自定义标签
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<FairTagContent> tag;
     /**
      * 标题
      */

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/fair/FairTagContent.java

@@ -0,0 +1,25 @@
+package com.citu.module.menduner.system.dal.dataobject.fair;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 招聘会标签
+ **/
+@Data
+public class FairTagContent {
+
+    /**
+     * 标签标题
+     */
+    private String title;
+    /**
+     * 标签key(例如职位的某个属性，positionId)
+     */
+    private String key;
+    /**
+     * 标签值(职位的某个属性的匹配值)
+     */
+    private List<String> value;
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/fair/FairDetailMapper.java

@@ -10,7 +10,6 @@ import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.citu.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobPageReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobRespVO;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseRespVO;
 import com.citu.module.menduner.system.controller.base.fair.*;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.fair.FairDO;
@@ -111,6 +110,9 @@ public interface FairDetailMapper extends BaseMapperX<FairDetailDO> {
                     .likeIfExists(EnterpriseDO::getAnotherName, reqVO.getKeyword()));
         }
         query.eq(FairDetailDO::getStatus, JobFairStatusEnum.NORMAL.getStatus());
+        if (null != reqVO.getIndustryId()) {
+            query.in(EnterpriseDO::getIndustryId, reqVO.getIndustryId());
+        }
         query.groupBy(FairDetailDO::getEnterpriseId);
 
         return selectJoinPage(reqVO, JobFairEnterpriseRespVO.class, query);
@@ -121,13 +123,17 @@ public interface FairDetailMapper extends BaseMapperX<FairDetailDO> {
         MPJLambdaWrapperX<FairDetailDO> query = new MPJLambdaWrapperX<>();
         query.selectAs(FairDetailDO::getJobFairId, JobFairJobInfoRespVO::getJobFairId);
         query.selectAll(JobAdvertisedDO.class);
+        query.selectAssociation(EnterpriseDO.class,JobFairJobInfoRespVO::getEnterprise);
         query.innerJoin(FairDO.class, FairDO::getId, FairDetailDO::getJobFairId);
         query.innerJoin(JobAdvertisedDO.class, JobAdvertisedDO::getId, FairDetailDO::getJobId);
+        query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, FairDetailDO::getEnterpriseId);
         query.eqIfPresent(FairDetailDO::getJobFairId, reqVO.getJobFairId());
         query.eqIfPresent(FairDetailDO::getEnterpriseId, reqVO.getEnterpriseId());
         query.likeIfExists(JobAdvertisedDO::getName, reqVO.getKeyword());
         query.eq(FairDetailDO::getStatus, JobFairStatusEnum.NORMAL.getStatus());
-
+        if (null != reqVO.getPositionId()) {
+            query.in(JobAdvertisedDO::getPositionId, reqVO.getPositionId());
+        }
         return selectJoinPage(reqVO, JobFairJobInfoRespVO.class, query);
     }