fix 项目经历

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitCompanyQueryBo.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;
 
@@ -94,4 +95,12 @@ public class RecruitCompanyQueryBo extends BaseEntity {
 	@ApiModelProperty("商户ID")
 	private Long tenantId;
 
+	/** 公司规模集合 */
+	@ApiModelProperty("公司规模集合")
+	private List<Integer> sizeIds;
+
+	/** 公司类型集合 */
+	@ApiModelProperty("公司类型集合")
+	private List<Integer> typeIds;
+
 }

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

@@ -65,6 +65,11 @@ public class RecruitNeedsQueryBo extends BaseEntity {
 	/** 工作年限字典值 */
 	@ApiModelProperty("工作年限字典值")
 	private String workingYearsDict;
+
+	/** 工作年限字典值集合 */
+	@ApiModelProperty("工作年限字典值集合")
+	private List<String> workingYearsDictList;
+
 	/** 工作年限起 */
 	@ApiModelProperty("工作年限起")
 	private Integer workingYearsStart;
@@ -74,6 +79,20 @@ public class RecruitNeedsQueryBo extends BaseEntity {
 	/** 最低学历字典值 */
 	@ApiModelProperty("最低学历字典值")
 	private String minimumEduDict;
+
+
+	/** 最低学历字典值集合 */
+	@ApiModelProperty("最低学历字典值集合")
+	private List<String> minimumEduDictList;
+
+	/** 公司规模集合 */
+	@ApiModelProperty("公司规模集合")
+	private List<Integer> sizeIds;
+
+	/** 公司类型集合 */
+	@ApiModelProperty("公司类型集合")
+	private List<Integer> typeIds;
+
 	/** 专业 */
 	@ApiModelProperty("专业")
 	private String major;

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

@@ -130,6 +130,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+        <if test="sizeIds != null and sizeIds.size()!=0 ">
+            AND company_size_id in
+            <foreach collection="sizeIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="typeIds != null and typeIds.size()!=0 ">
+            AND company_type_id in
+            <foreach collection="typeIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </select>
 
 </mapper>

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

@@ -62,6 +62,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="job != null and job != ''">
             AND rn.job like concat('%', #{job}, '%')
         </if>
+        <if test="jobNature != null and jobNature != ''">
+            AND rn.job_nature like concat('%', #{jobNature}, '%')
+        </if>
         <if test="companyName != null and companyName != ''">
             AND vtc.company_name like concat('%', #{companyName}, '%')
         </if>
@@ -71,19 +74,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="minimumEduDictList != null and minimumEduDictList.size()!=0 ">
+            AND rn.minimum_edu_dict in
+            <foreach collection="minimumEduDictList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="workingYearsDictList != null and workingYearsDictList.size()!=0 ">
+            AND rn.working_years_dict in
+            <foreach collection="workingYearsDictList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="sizeIds != null and sizeIds.size()!=0 ">
+            AND vtc.company_size_id in
+            <foreach collection="sizeIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="typeIds != null and typeIds.size()!=0 ">
+            AND vtc.company_type_id in
+            <foreach collection="typeIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <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>
+            <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