简历筛选工资范围

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

@@ -0,0 +1,24 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * @author change
+ * @date 2021年08月20日 16:46
+ */
+@Data
+@ApiModel("招聘需求分页查询对象")
+public class RecruitIncomeQueryBo {
+
+    /** 薪资起点 */
+    @ApiModelProperty("薪资起点")
+    private BigDecimal incomeStart;
+    /** 薪资结点 */
+    @ApiModelProperty("薪资结点")
+    private BigDecimal incomeEnd;
+}

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

@@ -54,7 +54,11 @@ public class RecruitInterviewAddBo {
     /** 面试用户id */
     @ApiModelProperty("面试用户id")
     private Long userId;
-    /** 面试简历id */
-    @ApiModelProperty("面试简历id")
+    /** 1 在线简历投递  2 附件简历投递 */
+    @ApiModelProperty("1 在线简历投递  2 附件简历投递")
+    private Integer resumeStatus;
+
+    /** 面试简历ID */
+    @ApiModelProperty("面试简历ID")
     private Long resumeId;
 }

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

@@ -65,4 +65,8 @@ public class RecruitInterviewEditBo {
     /** 面试用户id */
     @ApiModelProperty("面试用户id")
     private Long userId;
+
+    /** 1 在线简历投递  2 附件简历投递 */
+    @ApiModelProperty("1 在线简历投递  2 附件简历投递")
+    private Integer resumeStatus;
 }

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

@@ -66,5 +66,8 @@ public class RecruitInterviewQueryBo extends BaseEntity {
 	/** 面试用户id */
 	@ApiModelProperty("面试用户id")
 	private Long userId;
+	/** 1 在线简历投递  2 附件简历投递 */
+	@ApiModelProperty("1 在线简历投递  2 附件简历投递")
+	private Integer resumeStatus;
 
 }

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

@@ -115,4 +115,8 @@ public class RecruitNeedsQueryBo extends BaseEntity {
 	@ApiModelProperty("公司名")
 	private String companyName;
 
+	/** 公司名 */
+	@ApiModelProperty("工资要求List")
+	private List<RecruitIncomeQueryBo> incomeList;
+
 }

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

@@ -66,4 +66,7 @@ private static final long serialVersionUID=1L;
     /** 面试用户id */
     private Long userId;
 
+    /** 1 在线简历投递  2 附件简历投递 */
+    private Integer resumeStatus;
+
 }

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

@@ -8,6 +8,7 @@ import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.recruit.bo.RecruitIncomeQueryBo;
 import com.zhongzheng.modules.recruit.bo.RecruitNeedsAddBo;
 import com.zhongzheng.modules.recruit.bo.RecruitNeedsEditBo;
 import com.zhongzheng.modules.recruit.bo.RecruitNeedsQueryBo;
@@ -25,6 +26,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -90,6 +93,12 @@ public class RecruitNeedsServiceImpl extends ServiceImpl<RecruitNeedsMapper, Rec
 
     @Override
     public List<RecruitNeeds> queryRecruitNeedsList(RecruitNeedsQueryBo bo) {
+        if (bo.getIncomeType() == 2){
+            for (RecruitIncomeQueryBo recruitIncomeQueryBo : bo.getIncomeList()) {
+                recruitIncomeQueryBo.setIncomeStart(recruitIncomeQueryBo.getIncomeStart().divide(new BigDecimal("12"),1,BigDecimal.ROUND_HALF_UP));
+                recruitIncomeQueryBo.setIncomeEnd(recruitIncomeQueryBo.getIncomeEnd().divide(new BigDecimal("12"),1,BigDecimal.ROUND_HALF_UP));
+            }
+        }
         return recruitNeedsMapper.queryRecruitNeedsList(bo);
     }
 

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

@@ -64,5 +64,9 @@ public class RecruitInterviewVo {
 	@Excel(name = "面试用户id")
 	@ApiModelProperty("面试用户id")
 	private Long userId;
+	/** 1 在线简历投递  2 附件简历投递 */
+	@Excel(name = "1 在线简历投递  2 附件简历投递")
+	@ApiModelProperty("1 在线简历投递  2 附件简历投递")
+	private Integer resumeStatus;
 
 }

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

@@ -110,28 +110,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectLimt" resultMap="RecruitCompanyVoResult" parameterType="com.zhongzheng.modules.recruit.bo.RecruitCompanyQueryBo">
         SELECT * FROM v_tenant_company where status = 1
-        <trim prefix='and' prefixOverrides='and'>
-            <if test="status!=null">status=#{status}</if>
-            <if test="companyId!=null">company_id=#{companyId}</if>
-            <if test="companyName!=null">tenant_name=#{companyName}</if>
-            <if test="companyTypeId!=null">company_type_id=#{companyTypeId}</if>
-            <if test="companySizeId!=null">company_size_id=#{companySizeId}</if>
-            <if test="industryTypeId!=null">industry_type_id=#{industryTypeId}</if>
-            <if test="industryTypeName!=null">industry_type_name=#{industryTypeName}</if>
-            <if test="companyIntroduce!=null">company_introduce=#{companyIntroduce}</if>
-            <if test="logoUrl!=null">logo_url=#{logoUrl}</if>
-            <if test="licenseUrl!=null">license_url=#{licenseUrl}</if>
-            <if test="societyCode!=null">society_code=#{societyCode}</if>
-            <if test="province!=null">province=#{province}</if>
-            <if test="city!=null">city=#{city}</if>
-            <if test="address!=null">address=#{address}</if>
-            <if test="companyPh!=null">company_ph=#{companyPh}</if>
-            <if test="linkMan!=null">link_man=#{linkMan}</if>
-            <if test="postBox!=null">post_box=#{postBox}</if>
-            <if test="district!=null">district=#{district}</if>
-            <if test="updateTime!=null">update_time=#{updateTime}</if>
-            <if test="createTime!=null">create_time=#{createTime}</if>
-        </trim>
+            <if test="status!=null">and status=#{status}</if>
+            <if test="companyId!=null">and company_id=#{companyId} </if>
+            <if test="companyName!=null">and tenant_name like concat('%', #{companyName}, '%')</if>
+            <if test="companyTypeId!=null">and company_type_id=#{companyTypeId}</if>
+            <if test="companySizeId!=null">and company_size_id=#{companySizeId}</if>
+            <if test="industryTypeId!=null">and industry_type_id=#{industryTypeId}</if>
+            <if test="industryTypeName!=null">and industry_type_name=#{industryTypeName}</if>
+            <if test="companyIntroduce!=null">and company_introduce=#{companyIntroduce}</if>
+            <if test="logoUrl!=null">and logo_url=#{logoUrl}</if>
+            <if test="licenseUrl!=null">and license_url=#{licenseUrl}</if>
+            <if test="societyCode!=null">and society_code=#{societyCode}</if>
+            <if test="province!=null">and province=#{province}</if>
+            <if test="city!=null">and city=#{city}</if>
+            <if test="address!=null">and address=#{address}</if>
+            <if test="companyPh!=null">and company_ph=#{companyPh}</if>
+            <if test="linkMan!=null">and link_man=#{linkMan}</if>
+            <if test="postBox!=null">and post_box=#{postBox}</if>
+            <if test="district!=null">and district=#{district}</if>
+            <if test="updateTime!=null">and update_time=#{updateTime}</if>
+            <if test="createTime!=null">and create_time=#{createTime}</if>
     </select>
 
 </mapper>

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

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="userId" column="user_id"/>
+        <result property="resumeStatus" column="resume_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.recruit.vo.RecruitInterviewVo" id="RecruitInterviewVoResult">
@@ -32,14 +33,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="userId" column="user_id"/>
+        <result property="resumeStatus" column="resume_status"/>
     </resultMap>
 
     <select id="selectByDay" parameterType="map" resultMap="RecruitInterviewVoResult">
         select * from recruit_interview where 1=1
-        <trim prefix='and' prefixOverrides='and'>
-            <if test="year!=null">year=#{year}</if>
-            <if test="month!=null">month=#{month}</if>
-            <if test="day!=null">day=#{day}</if>
-        </trim>
+            <if test="year!=null">
+                and year=#{year}
+            </if>
+            <if test="month!=null">
+                and month=#{month}
+            </if>
+            <if test="day!=null">
+                and day=#{day}
+            </if>
     </select>
 </mapper>

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

@@ -74,6 +74,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="pushTimeStart != null and pushTimeStart != ''">
             AND rn.push_time > #{pushTimeStart}
         </if>
+        <if test="incomeList != null and incomeList.size!=0 ">
+        AND
+        <foreach collection="incomeList" item="item" separator="OR">
+            ((
+            income_start BETWEEN #{item.incomeStart} AND #{item.incomeEnd}
+            OR income_end BETWEEN #{item.incomeStart} AND  #{item.incomeEnd}
+            AND income_type = 1
+            )
+            OR ( income_start BETWEEN  #{item.incomeStart} * 12 AND #{item.incomeEnd} * 12 OR income_end BETWEEN #{item.incomeStart}  * 12 AND #{item.incomeEnd} * 12 AND income_type = 2 ) )
+        </foreach>
+        </if>
         <if test="pushTimeEnd != null and pushTimeEnd != ''">
             AND #{pushTimeEnd} > rn.push_time
         </if>