fix 招聘简历筛选

zhongzheng-admin/src/main/java/com/zhongzheng/controller/recruit/RecruitNeedsController.java

@@ -6,6 +6,7 @@ import java.util.Arrays;
 import com.zhongzheng.modules.recruit.bo.RecruitNeedsAddBo;
 import com.zhongzheng.modules.recruit.bo.RecruitNeedsEditBo;
 import com.zhongzheng.modules.recruit.bo.RecruitNeedsQueryBo;
+import com.zhongzheng.modules.recruit.domain.RecruitNeeds;
 import com.zhongzheng.modules.recruit.service.IRecruitNeedsService;
 import com.zhongzheng.modules.recruit.vo.RecruitNeedsVo;
 import lombok.RequiredArgsConstructor;
@@ -48,9 +49,9 @@ public class RecruitNeedsController extends BaseController {
     @ApiOperation("查询招聘需求列表")
     @PreAuthorize("@ss.hasPermi('recruit:needs:list')")
     @GetMapping("/list")
-    public TableDataInfo<RecruitNeedsVo> list(RecruitNeedsQueryBo bo) {
+    public TableDataInfo<RecruitNeeds> list(RecruitNeedsQueryBo bo) {
         startPage();
-        List<RecruitNeedsVo> list = iRecruitNeedsService.queryList(bo);
+        List<RecruitNeeds> list = iRecruitNeedsService.queryRecruitNeedsList(bo);
         return getDataTable(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitNeedsEditBo.java

@@ -122,4 +122,8 @@ public class RecruitNeedsEditBo {
     /** 是否加急 0不是 1是 */
     @ApiModelProperty("是否加急 0不是 1是")
     private Integer isUrgent;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long pushTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitNeedsQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -78,7 +79,7 @@ public class RecruitNeedsQueryBo extends BaseEntity {
 	private String major;
 	/** 0 失效 1启用 */
 	@ApiModelProperty("0 停止 1未发布 2已发布")
-	private Integer status;
+	private List<Integer> status;
 	/** 商户ID */
 	@ApiModelProperty("商户ID")
 	private Long tenantId;
@@ -109,5 +110,12 @@ public class RecruitNeedsQueryBo extends BaseEntity {
 	/** 是否加急 0不是 1是 */
 	@ApiModelProperty("是否加急 0不是 1是")
 	private Integer isUrgent;
+	/** 发布时间开始 */
+	private Long pushTimeStart;
+	/** 发布时间结束 */
+	private Long pushTimeEnd;
+	/** 公司名 */
+	@ApiModelProperty("公司名")
+	private String companyName;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitTemplateQueryBo.java

@@ -35,8 +35,6 @@ public class RecruitTemplateQueryBo extends BaseEntity {
 	/** 排序的方向desc或者asc */
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	private String isAsc;
-
-
 	/** 公司ID，母公司ID为0 */
 	@ApiModelProperty("公司ID，母公司ID为0")
 	private Long companyId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/domain/RecruitNeeds.java

@@ -108,4 +108,19 @@ private static final long serialVersionUID=1L;
     /** 是否加急 0不是 1是 */
     private Integer isUrgent;
 
+    /** 发布时间 */
+    private Long pushTime;
+
+    /** 最低学历文本 */
+    @TableField(exist = false)
+    private String minimumEduLabel;
+
+    /** 工作年限文本 */
+    @TableField(exist = false)
+    private String workingYearsLabel;
+
+    /** 公司名 */
+    @TableField(exist = false)
+    private String companyName;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/mapper/RecruitNeedsMapper.java

@@ -1,7 +1,12 @@
 package com.zhongzheng.modules.recruit.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.recruit.bo.RecruitNeedsQueryBo;
+import com.zhongzheng.modules.recruit.bo.RecruitTemplateQueryBo;
 import com.zhongzheng.modules.recruit.domain.RecruitNeeds;
+import com.zhongzheng.modules.recruit.domain.RecruitTemplate;
+
+import java.util.List;
 
 /**
  * 招聘需求Mapper接口
@@ -11,4 +16,6 @@ import com.zhongzheng.modules.recruit.domain.RecruitNeeds;
  */
 public interface RecruitNeedsMapper extends BaseMapper<RecruitNeeds> {
 
+    List<RecruitNeeds> queryRecruitNeedsList(RecruitNeedsQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/service/IRecruitNeedsService.java

@@ -28,6 +28,8 @@ public interface IRecruitNeedsService extends IService<RecruitNeeds> {
 	 */
 	List<RecruitNeedsVo> queryList(RecruitNeedsQueryBo bo);
 
+	List<RecruitNeeds> queryRecruitNeedsList(RecruitNeedsQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入招聘需求
 	 * @param bo 招聘需求新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/service/impl/RecruitNeedsServiceImpl.java

@@ -8,8 +8,10 @@ import com.zhongzheng.modules.recruit.bo.RecruitNeedsEditBo;
 import com.zhongzheng.modules.recruit.bo.RecruitNeedsQueryBo;
 import com.zhongzheng.modules.recruit.domain.RecruitNeeds;
 import com.zhongzheng.modules.recruit.mapper.RecruitNeedsMapper;
+import com.zhongzheng.modules.recruit.mapper.RecruitTemplateMapper;
 import com.zhongzheng.modules.recruit.service.IRecruitNeedsService;
 import com.zhongzheng.modules.recruit.vo.RecruitNeedsVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,6 +32,10 @@ import java.util.stream.Collectors;
 @Service
 public class RecruitNeedsServiceImpl extends ServiceImpl<RecruitNeedsMapper, RecruitNeeds> implements IRecruitNeedsService {
 
+
+    @Autowired
+    private RecruitNeedsMapper recruitNeedsMapper;
+
     @Override
     public RecruitNeedsVo queryById(Long id){
         RecruitNeeds db = this.baseMapper.selectById(id);
@@ -66,6 +72,11 @@ public class RecruitNeedsServiceImpl extends ServiceImpl<RecruitNeedsMapper, Rec
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<RecruitNeeds> queryRecruitNeedsList(RecruitNeedsQueryBo bo) {
+        return recruitNeedsMapper.queryRecruitNeedsList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/vo/RecruitNeedsVo.java

@@ -121,5 +121,9 @@ public class RecruitNeedsVo {
 	@Excel(name = "是否加急 0不是 1是")
 	@ApiModelProperty("是否加急 0不是 1是")
 	private Integer isUrgent;
+	/** 发布时间 */
+	@Excel(name = "发布时间")
+	@ApiModelProperty("发布时间")
+	private Long pushTime;
 
 }

zhongzheng-system/src/main/resources/mapper/modules/recruit/RecruitNeedsMapper.xml

@@ -32,7 +32,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jobNature" column="job_nature"/>
         <result property="bonusCertificate" column="bonus_certificate"/>
         <result property="isUrgent" column="is_urgent"/>
+        <result property="minimumEduLabel" column="minimum_edu_label"/>
+        <result property="workingYearsLabel" column="working_years_label"/>
+        <result property="companyName" column="company_name"/>
     </resultMap>
 
+    <select id="queryRecruitNeedsList" parameterType="com.zhongzheng.modules.recruit.bo.RecruitNeedsQueryBo"  resultMap="RecruitNeedsResult">
+        SELECT
+        rn.*,
+        dd.dict_label AS minimum_edu_label,
+        dd1.dict_label AS working_years_label,
+        vtc.company_name
+        FROM
+        recruit_needs rn
+        LEFT JOIN sys_dict_data dd ON rn.minimum_edu_dict = dd.dict_code
+        LEFT JOIN sys_dict_data dd1 ON rn.working_years_dict = dd1.dict_code
+        LEFT JOIN v_tenant_company vtc ON rn.company_id = vtc.company_id
+        WHERE
+        1 = 1
+        <if test="job != null and job != ''">
+            AND rn.job like concat('%', #{job}, '%')
+        </if>
+        <if test="companyName != null and companyName != ''">
+            AND vtc.company_name like concat('%', #{companyName}, '%')
+        </if>
+        <if test="status != null and status.size()!=0 ">
+            AND rn.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="pushTimeStart != null and pushTimeStart != ''">
+            AND rn.push_time > #{pushTimeStart}
+        </if>
+        <if test="pushTimeEnd != null and pushTimeEnd != ''">
+            AND #{pushTimeEnd} > rn.push_time
+        </if>
+        ORDER BY
+        rn.id DESC
+    </select>
 
 </mapper>