简历需求

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

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

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

@@ -218,8 +218,7 @@ public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMap
             for (QuantumVo quantumVo : dayInterviewVo.getQuantumList()) {
                 List<RecruitInterviewVo> recruitInterviewVos = baseMapper.selectByDay(
                         Convert.toInt(dayInterviewVo.getDate()),dayInterviewVo.getMonth(), bo.getYear()
-                        , quantumVo.getTimingStart(), quantumVo.getTimingEnd(),
-                        bo.getStatusIds());
+                        , quantumVo.getTimingStart(), quantumVo.getTimingEnd(), bo.getStatusIds());
                 for (RecruitInterviewVo recruitInterviewVo : recruitInterviewVos) {
                         RecruitResumeVo recruitResumeVo = JSON.parseObject(recruitInterviewVo.getResumeJson(), new TypeReference<RecruitResumeVo>() {
                         });

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

@@ -3,6 +3,8 @@ package com.zhongzheng.modules.recruit.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
 import com.zhongzheng.common.core.domain.entity.SysDictData;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.exception.CustomException;
@@ -90,8 +92,11 @@ public class RecruitNeedsServiceImpl extends ServiceImpl<RecruitNeedsMapper, Rec
 
     @Override
     public List<RecruitNeeds> queryRecruitNeedsList(RecruitNeedsQueryBo bo) {
-        if (bo.getIncomeType() != null && bo.getIncomeType() == 2){
-            for (RecruitIncomeQueryBo recruitIncomeQueryBo : bo.getIncomeList()) {
+
+        if (bo.getIncomeList() != null && bo.getIncomeType() == 2){
+            List<RecruitIncomeQueryBo> recruitIncomeQueryBos = JSONUtil.toList(bo.getIncomeList(), RecruitIncomeQueryBo.class);
+            bo.setIncomeListJson(recruitIncomeQueryBos);
+            for (RecruitIncomeQueryBo recruitIncomeQueryBo : bo.getIncomeListJson()) {
                 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));
             }

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

@@ -104,9 +104,9 @@ 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 ">
+        <if test="incomeListJson != null and incomeListJson.size!=0 ">
         AND
-            <foreach collection="incomeList" item="item" separator="OR">
+            <foreach collection="incomeListJson" item="item" separator="OR">
                 ((
                 income_start BETWEEN #{item.incomeStart} AND #{item.incomeEnd}
                 OR income_end BETWEEN #{item.incomeStart} AND  #{item.incomeEnd}