修改企业

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

@@ -21,4 +21,6 @@ public interface RecruitCompanyMapper extends BaseMapper<RecruitCompany> {
     RecruitCompanyVo selectCompanyList(RecruitCompanyQueryBo bo);
 
     Integer updateSysTent(RecruitCompany update);
+
+    List<RecruitCompanyVo> selectLimt(RecruitCompanyQueryBo bo);
 }

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

@@ -68,32 +68,9 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
 
     @Override
     public List<RecruitCompanyVo> queryList(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);
-        for (RecruitCompanyVo companyVo : companyVos) {
+        List<RecruitCompanyVo> recruitCompanyVos = baseMapper.selectLimt(bo);
+
+        for (RecruitCompanyVo companyVo : recruitCompanyVos) {
             if (companyVo.getCompanyTypeId() != null && companyVo.getCompanySizeId() != null) {
                 SysDictData sysDictData = dictDataService.selectDictDataById(companyVo.getCompanyTypeId());
                 SysDictData sysDictData1 = dictDataService.selectDictDataById(companyVo.getCompanySizeId());
@@ -101,7 +78,7 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
                 companyVo.setCompanySize(sysDictData1.getDictLabel());
             }
         }
-        return companyVos;
+        return recruitCompanyVos;
     }
 
     /**

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

@@ -1,7 +1,9 @@
 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 com.zhongzheng.common.core.domain.entity.SysDictData;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
@@ -14,6 +16,7 @@ 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 com.zhongzheng.modules.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.token.TokenService;
 import org.springframework.stereotype.Service;
@@ -40,12 +43,20 @@ public class RecruitNeedsServiceImpl extends ServiceImpl<RecruitNeedsMapper, Rec
     @Autowired
     private RecruitNeedsMapper recruitNeedsMapper;
 
+    @Autowired
+    private ISysDictDataService dictDataService;
+
 
 
     @Override
     public RecruitNeedsVo queryById(Long id){
         RecruitNeeds db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, RecruitNeedsVo.class);
+        RecruitNeedsVo recruitNeedsVo = BeanUtil.toBean(db, RecruitNeedsVo.class);
+        SysDictData sysDictData1 = dictDataService.selectDictDataById(Convert.toLong(recruitNeedsVo.getMinimumEduDict()));
+        SysDictData sysDictData = dictDataService.selectDictDataById(Convert.toLong(recruitNeedsVo.getWorkingYearsDict()));
+        recruitNeedsVo.setMinimumEduDictLabel(sysDictData1.getDictLabel());
+        recruitNeedsVo.setWorkingYearsDictLabel(sysDictData.getDictLabel());
+        return recruitNeedsVo;
     }
 
     @Override

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

@@ -61,6 +61,10 @@ public class RecruitNeedsVo {
 	@Excel(name = "工作年限字典值")
 	@ApiModelProperty("工作年限字典值")
 	private String workingYearsDict;
+
+	@Excel(name = "工作年限")
+	@ApiModelProperty("工作年限")
+	private String workingYearsDictLabel;
 	/** 工作年限起 */
 	@Excel(name = "工作年限起")
 	@ApiModelProperty("工作年限起")
@@ -73,6 +77,9 @@ public class RecruitNeedsVo {
 	@Excel(name = "最低学历字典值")
 	@ApiModelProperty("最低学历字典值")
 	private String minimumEduDict;
+	@Excel(name = "最低学历")
+	@ApiModelProperty("最低学历")
+	private String minimumEduDictLabel;
 	/** 专业 */
 	@Excel(name = "专业")
 	@ApiModelProperty("专业")

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

@@ -107,4 +107,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE tenant_id=#{tenantId}
     </update>
 
+
+    <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="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>
+    </select>
+
 </mapper>