公司更改

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

@@ -5,6 +5,7 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.recruit.bo.RecruitCompanyAddBo;
 import com.zhongzheng.modules.recruit.bo.RecruitCompanyEditBo;
 import com.zhongzheng.modules.recruit.bo.RecruitCompanyQueryBo;

zhongzheng-api/src/main/java/com/zhongzheng/controller/recruit/RecruitCompanyController.java

@@ -0,0 +1,59 @@
+package com.zhongzheng.controller.recruit;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyQueryBo;
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyTradeQueryBo;
+import com.zhongzheng.modules.recruit.service.IRecruitCompanyService;
+import com.zhongzheng.modules.recruit.service.IRecruitCompanyTradeService;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyNeedVo;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyTradeVo;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 公司管理列Controller
+ * 
+ * @author ruoyi
+ * @date 2021-08-12
+ */
+@Api(value = "公司管理列控制器", tags = {"公司管理列管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/common/recruit/companyCon")
+public class RecruitCompanyController extends BaseController {
+
+    private final IRecruitCompanyService iRecruitCompanyService;
+
+
+    private final IRecruitCompanyTradeService iRecruitCompanyTradeService;
+
+
+    /**
+     * 查询公司管理列列表
+     */
+    @ApiOperation("查询公司管理列列表")
+    @GetMapping("/list")
+    public TableDataInfo<RecruitCompanyNeedVo> list(RecruitCompanyQueryBo bo) {
+        startPage();
+        List<RecruitCompanyNeedVo> list = iRecruitCompanyService.queryNeedsList(bo);
+        return getDataTable(list);
+    }
+
+
+}

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

@@ -1,7 +1,12 @@
 package com.zhongzheng.modules.recruit.mapper;
 
+import com.zhongzheng.modules.recruit.bo.RecruitCompanyQueryBo;
 import com.zhongzheng.modules.recruit.domain.RecruitCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyNeedVo;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyVo;
+
+import java.util.List;
 
 /**
  * 公司管理列Mapper接口
@@ -12,4 +17,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface RecruitCompanyMapper extends BaseMapper<RecruitCompany> {
 
     Long selectIndustry(String toString);
+
+    RecruitCompanyVo selectCompanyList(RecruitCompanyQueryBo bo);
+
+    Integer updateSysTent(RecruitCompany update);
 }

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

@@ -18,4 +18,5 @@ public interface RecruitNeedsMapper extends BaseMapper<RecruitNeeds> {
 
     List<RecruitNeeds> queryRecruitNeedsList(RecruitNeedsQueryBo bo);
 
+    List<String> queryRecruitNeedsListString(RecruitNeedsQueryBo recruitNeedsQueryBo);
 }

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.recruit.service;
 
 import com.zhongzheng.modules.recruit.domain.RecruitCompany;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyNeedVo;
 import com.zhongzheng.modules.recruit.vo.RecruitCompanyVo;
 import com.zhongzheng.modules.recruit.bo.RecruitCompanyQueryBo;
 import com.zhongzheng.modules.recruit.bo.RecruitCompanyAddBo;
@@ -53,4 +54,6 @@ public interface IRecruitCompanyService extends IService<RecruitCompany> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
 	Boolean batchImport(MultipartFile file) throws IOException;
+
+	List<RecruitCompanyNeedVo> queryNeedsList(RecruitCompanyQueryBo bo);
 }

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

@@ -51,4 +51,6 @@ public interface IRecruitNeedsService extends IService<RecruitNeeds> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<String> queryRecruitNeedsListString(RecruitNeedsQueryBo recruitNeedsQueryBo);
 }

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

@@ -8,8 +8,12 @@ import cn.hutool.poi.excel.ExcelUtil;
 import com.zhongzheng.common.core.domain.entity.SysDictData;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.recruit.bo.RecruitNeedsQueryBo;
 import com.zhongzheng.modules.recruit.domain.RecruitCompanyTrade;
+import com.zhongzheng.modules.recruit.domain.RecruitNeeds;
 import com.zhongzheng.modules.recruit.service.IRecruitCompanyTradeService;
+import com.zhongzheng.modules.recruit.service.IRecruitNeedsService;
+import com.zhongzheng.modules.recruit.vo.RecruitCompanyNeedVo;
 import com.zhongzheng.modules.recruit.vo.RecruitCompanyTradeVo;
 import com.zhongzheng.modules.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +56,9 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
     @Autowired
     private IRecruitCompanyTradeService iRecruitCompanyTradeService;
 
+    @Autowired
+    private IRecruitNeedsService iRecruitNeedsService;
+
 
     @Override
     public RecruitCompanyVo queryById(Long companyId){
@@ -81,11 +88,18 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
         lqw.eq(RecruitCompany::getStatus, 1);
         lqw.eq(bo.getTenantId() != null, RecruitCompany::getTenantId, bo.getTenantId());
         List<RecruitCompanyVo> companyVos = entity2Vo(this.list(lqw));
+        String TenantId = ServletUtils.getRequest().getHeader("TenantId");
+        bo.setTenantId(Convert.toLong(TenantId));
+        RecruitCompanyVo companyList = baseMapper.selectCompanyList(bo);
+        companyList.setCompanyId(0L);
+        companyVos.add(companyList);
         for (RecruitCompanyVo companyVo : companyVos) {
-            SysDictData sysDictData = dictDataService.selectDictDataById(companyVo.getCompanyTypeId());
-            SysDictData sysDictData1 = dictDataService.selectDictDataById(companyVo.getCompanySizeId());
-            companyVo.setCompanyType(sysDictData.getDictLabel());
-            companyVo.setCompanySize(sysDictData1.getDictLabel());
+            if (companyVo.getCompanyTypeId() != null && companyVo.getCompanySizeId() != null) {
+                SysDictData sysDictData = dictDataService.selectDictDataById(companyVo.getCompanyTypeId());
+                SysDictData sysDictData1 = dictDataService.selectDictDataById(companyVo.getCompanySizeId());
+                companyVo.setCompanyType(sysDictData.getDictLabel());
+                companyVo.setCompanySize(sysDictData1.getDictLabel());
+            }
         }
         return companyVos;
     }
@@ -124,11 +138,21 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
 
     @Override
     public Boolean updateByEditBo(RecruitCompanyEditBo bo) {
+        RecruitCompanyTradeVo companyTradeVo = iRecruitCompanyTradeService.queryById(bo.getIndustryTypeId());
+        if (bo.getCompanyId() == 0){
+            RecruitCompany update = BeanUtil.toBean(bo, RecruitCompany.class);
+            update.setUpdateTime(DateUtils.getNowTime());
+            update.setUpdateTime(DateUtils.getNowTime());
+            update.setIndustryTypeName(companyTradeVo.getTradeName());
+            String TenantId = ServletUtils.getRequest().getHeader("TenantId");
+            update.setTenantId(Convert.toLong(TenantId));
+            return baseMapper.updateSysTent(update)==1;
+        }
         RecruitCompany update = BeanUtil.toBean(bo, RecruitCompany.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         update.setUpdateTime(DateUtils.getNowTime());
-        RecruitCompanyTradeVo companyTradeVo = iRecruitCompanyTradeService.queryById(bo.getIndustryTypeId());
+
         update.setIndustryTypeName(companyTradeVo.getTradeName());
         return this.updateById(update);
     }
@@ -200,4 +224,68 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
         }
         return this.saveBatch(companyList);
     }
+
+    @Override
+    public List<RecruitCompanyNeedVo> queryNeedsList(RecruitCompanyQueryBo bo) {
+        LambdaQueryWrapper<RecruitCompany> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getCompanyName()), RecruitCompany::getCompanyName, bo.getCompanyName());
+        lqw.eq(bo.getCompanyTypeId() != null, RecruitCompany::getCompanyTypeId, bo.getCompanyTypeId());
+        lqw.eq(bo.getCompanySizeId() != null, RecruitCompany::getCompanySizeId, bo.getCompanySizeId());
+        lqw.eq(bo.getIndustryTypeId() != null, RecruitCompany::getIndustryTypeId, bo.getIndustryTypeId());
+        lqw.like(StrUtil.isNotBlank(bo.getIndustryTypeName()), RecruitCompany::getIndustryTypeName, bo.getIndustryTypeName());
+        lqw.eq(StrUtil.isNotBlank(bo.getCompanyIntroduce()), RecruitCompany::getCompanyIntroduce, bo.getCompanyIntroduce());
+        lqw.eq(StrUtil.isNotBlank(bo.getLogoUrl()), RecruitCompany::getLogoUrl, bo.getLogoUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getLicenseUrl()), RecruitCompany::getLicenseUrl, bo.getLicenseUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getSocietyCode()), RecruitCompany::getSocietyCode, bo.getSocietyCode());
+        lqw.eq(StrUtil.isNotBlank(bo.getProvince()), RecruitCompany::getProvince, bo.getProvince());
+        lqw.eq(StrUtil.isNotBlank(bo.getCity()), RecruitCompany::getCity, bo.getCity());
+        lqw.eq(StrUtil.isNotBlank(bo.getDistrict()), RecruitCompany::getDistrict, bo.getDistrict());
+        lqw.eq(StrUtil.isNotBlank(bo.getAddress()), RecruitCompany::getAddress, bo.getAddress());
+        lqw.eq(StrUtil.isNotBlank(bo.getCompanyPh()), RecruitCompany::getCompanyPh, bo.getCompanyPh());
+        lqw.eq(StrUtil.isNotBlank(bo.getLinkMan()), RecruitCompany::getLinkMan, bo.getLinkMan());
+        lqw.eq(StrUtil.isNotBlank(bo.getPostBox()), RecruitCompany::getPostBox, bo.getPostBox());
+        lqw.eq(RecruitCompany::getStatus, 1);
+        lqw.eq(bo.getTenantId() != null, RecruitCompany::getTenantId, bo.getTenantId());
+        List<RecruitCompanyVo> companyVos = entity2Vo(this.list(lqw));
+        String TenantId = ServletUtils.getRequest().getHeader("TenantId");
+        bo.setTenantId(Convert.toLong(TenantId));
+        RecruitCompanyVo companyList = baseMapper.selectCompanyList(bo);
+        companyList.setCompanyId(0L);
+        companyVos.add(companyList);
+
+        List<RecruitCompanyNeedVo> recruitCompanyNeedVos = entityNeedsVo(companyVos);
+        for (RecruitCompanyNeedVo companyVo : recruitCompanyNeedVos) {
+            if (companyVo.getCompanyTypeId() != null && companyVo.getCompanySizeId() != null) {
+                SysDictData sysDictData = dictDataService.selectDictDataById(companyVo.getCompanyTypeId());
+                SysDictData sysDictData1 = dictDataService.selectDictDataById(companyVo.getCompanySizeId());
+                companyVo.setCompanyType(sysDictData.getDictLabel());
+                companyVo.setCompanySize(sysDictData1.getDictLabel());
+            }
+            RecruitNeedsQueryBo recruitNeedsQueryBo = new RecruitNeedsQueryBo();
+            recruitNeedsQueryBo.setCompanyId(companyVo.getCompanyId());
+            List<String> list = iRecruitNeedsService.queryRecruitNeedsListString(recruitNeedsQueryBo);
+            companyVo.setRecruitNeedsVoList(list);
+        }
+        return recruitCompanyNeedVos;
+    }
+
+    /**
+     * 实体类转化成视图对象
+     *
+     * @param collection 实体类集合
+     * @return
+     */
+    private List<RecruitCompanyNeedVo> entityNeedsVo(Collection<RecruitCompanyVo> collection) {
+        List<RecruitCompanyNeedVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, RecruitCompanyNeedVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<RecruitCompanyVo> page = (Page<RecruitCompanyVo>)collection;
+            Page<RecruitCompanyNeedVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
 }

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

@@ -150,4 +150,9 @@ public class RecruitNeedsServiceImpl extends ServiceImpl<RecruitNeedsMapper, Rec
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<String> queryRecruitNeedsListString(RecruitNeedsQueryBo recruitNeedsQueryBo) {
+        return recruitNeedsMapper.queryRecruitNeedsListString(recruitNeedsQueryBo);
+    }
 }

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

@@ -0,0 +1,151 @@
+package com.zhongzheng.modules.recruit.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.recruit.domain.RecruitNeeds;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author change
+ * @date 2021年08月19日 10:38
+ */
+@Data
+@ApiModel("公司管理列视图对象")
+public class RecruitCompanyNeedVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $pkColumn.columnComment
+     */
+    @ApiModelProperty("$pkColumn.columnComment")
+    private Long companyId;
+
+    /**
+     * 公司名称
+     */
+    @Excel(name = "公司名称")
+    @ApiModelProperty("公司名称")
+    private String companyName;
+    /**
+     * 公司类型
+     */
+    @Excel(name = "公司类型")
+    @ApiModelProperty("公司类型")
+    private Long companyTypeId;
+    /**
+     * 公司规模
+     */
+    @Excel(name = "公司规模")
+    @ApiModelProperty("公司规模")
+    private Long companySizeId;
+
+    @Excel(name = "公司类型")
+    @ApiModelProperty("公司类型")
+    private String companyType;
+
+    /**
+     * 公司规模
+     */
+    @Excel(name = "公司规模")
+    @ApiModelProperty("公司规模")
+    private String companySize;
+
+    /**
+     * 行业类别id
+     */
+    @Excel(name = "行业类别id")
+    @ApiModelProperty("行业类别id")
+    private Long industryTypeId;
+    /**
+     * 行业类别名字
+     */
+    @Excel(name = "行业类别名字")
+    @ApiModelProperty("行业类别名字")
+    private String industryTypeName;
+    /**
+     * 公司介绍
+     */
+    @Excel(name = "公司介绍")
+    @ApiModelProperty("公司介绍")
+    private String companyIntroduce;
+    /**
+     * 公司logo
+     */
+    @Excel(name = "公司logo")
+    @ApiModelProperty("公司logo")
+    private String logoUrl;
+    /**
+     * 营业执照
+     */
+    @Excel(name = "营业执照")
+    @ApiModelProperty("营业执照")
+    private String licenseUrl;
+    /**
+     * 统一社会信用代码
+     */
+    @Excel(name = "统一社会信用代码")
+    @ApiModelProperty("统一社会信用代码")
+    private String societyCode;
+    /**
+     * 省份
+     */
+    @Excel(name = "省份")
+    @ApiModelProperty("省份")
+    private String province;
+    /**
+     * 城市
+     */
+    @Excel(name = "城市")
+    @ApiModelProperty("城市")
+    private String city;
+    /**
+     * 区
+     */
+    @Excel(name = "区")
+    @ApiModelProperty("区")
+    private String district;
+    /**
+     * 详细地址
+     */
+    @Excel(name = "详细地址")
+    @ApiModelProperty("详细地址")
+    private String address;
+    /**
+     * 公司电话
+     */
+    @Excel(name = "公司电话")
+    @ApiModelProperty("公司电话")
+    private String companyPh;
+    /**
+     * 联系人
+     */
+    @Excel(name = "联系人")
+    @ApiModelProperty("联系人")
+    private String linkMan;
+    /**
+     * 邮箱
+     */
+    @Excel(name = "邮箱")
+    @ApiModelProperty("邮箱")
+    private String postBox;
+    /**
+     * -1 删除  1正常
+     */
+    @Excel(name = "-1 删除  1正常")
+    @ApiModelProperty("-1 删除  1正常")
+    private Integer status;
+    /**
+     * 商户ID
+     */
+    @Excel(name = "商户ID")
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+
+
+    @ApiModelProperty("招聘岗位")
+    private List<String> recruitNeedsVoList;
+
+}

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

@@ -28,8 +28,83 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.recruit.vo.RecruitCompanyVo" id="RecruitCompanyVoResult">
+        <result property="companyId" column="company_id"/>
+        <result property="companyName" column="company_name"/>
+        <result property="companyTypeId" column="company_type_id"/>
+        <result property="companySizeId" column="company_size_id"/>
+        <result property="industryTypeId" column="industry_type_id"/>
+        <result property="industryTypeName" column="industry_type_name"/>
+        <result property="companyIntroduce" column="company_introduce"/>
+        <result property="logoUrl" column="logo_url"/>
+        <result property="licenseUrl" column="license_url"/>
+        <result property="societyCode" column="society_code"/>
+        <result property="province" column="province"/>
+        <result property="city" column="city"/>
+        <result property="district" column="district"/>
+        <result property="address" column="address"/>
+        <result property="companyPh" column="company_ph"/>
+        <result property="linkMan" column="link_man"/>
+        <result property="postBox" column="post_box"/>
+        <result property="status" column="status"/>
+        <result property="tenantId" column="tenant_id"/>
+    </resultMap>
+
     <select id="selectIndustry" resultType="Long" parameterType="map">
         select trade_id FROM recruit_company_trade where trade_name=#{industry} LIMIT 1
     </select>
 
+    <select id="selectCompanyList" resultMap="RecruitCompanyVoResult" parameterType="com.zhongzheng.modules.recruit.bo.RecruitCompanyQueryBo">
+        SELECT
+            tenant_id,
+            create_time,
+            update_time,
+            status,
+            tenant_name AS company_name,
+            company_type_id,
+            company_size_id,
+            industry_type_id,
+            industry_type_name,
+            company_introduce,
+            logo_url,
+            license_url,
+            society_code,
+            province,
+            city,
+            district,
+            address,
+            company_ph,
+            link_man,
+            post_box
+        FROM
+            sys_tenant
+        where status=1 and tenant_id = #{tenantId} limit 1
+    </select>
+
+    <update id="updateSysTent" parameterType="com.zhongzheng.modules.recruit.domain.RecruitCompany" >
+        UPDATE sys_tenant
+        <trim prefix="set" suffixOverrides=",">
+            <if test="status!=null">status=#{status},</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>
+        WHERE tenant_id=#{tenantId}
+    </update>
+
 </mapper>

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

@@ -54,7 +54,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         1 = 1
         <if test="companyId != null and companyId != ''" >
-            AND rn.companyId = #{companyId}
+            AND rn.company_id = #{companyId}
+        </if>
+        <if test="city != null and city != ''">
+            AND rn.city like concat('%', #{city}, '%')
+        </if>
+        <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>
+
+    <select id="queryRecruitNeedsListString" parameterType="com.zhongzheng.modules.recruit.bo.RecruitNeedsQueryBo"  resultType="string">
+        SELECT
+        rn.job
+        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="companyId != null" >
+            AND rn.company_id = #{companyId}
         </if>
         <if test="city != null and city != ''">
             AND rn.city like concat('%', #{city}, '%')