修改企业

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

@@ -36,6 +36,9 @@ public class RecruitCompanyQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	/** 公司名称 */
+	@ApiModelProperty("公司名称")
+	private Long companyId;
 	/** 公司名称 */
 	@ApiModelProperty("公司名称")
 	private String companyName;

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

@@ -69,7 +69,6 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
     @Override
     public List<RecruitCompanyVo> queryList(RecruitCompanyQueryBo bo) {
         List<RecruitCompanyVo> recruitCompanyVos = baseMapper.selectLimt(bo);
-
         for (RecruitCompanyVo companyVo : recruitCompanyVos) {
             if (companyVo.getCompanyTypeId() != null && companyVo.getCompanySizeId() != null) {
                 SysDictData sysDictData = dictDataService.selectDictDataById(companyVo.getCompanyTypeId());
@@ -204,33 +203,10 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
 
     @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<RecruitCompanyVo> recruitCompanyVos = baseMapper.selectLimt(bo);
 
-        List<RecruitCompanyNeedVo> recruitCompanyNeedVos = entityNeedsVo(companyVos);
+
+        List<RecruitCompanyNeedVo> recruitCompanyNeedVos = entityNeedsVo(recruitCompanyVos);
         for (RecruitCompanyNeedVo companyVo : recruitCompanyNeedVos) {
             if (companyVo.getCompanyTypeId() != null && companyVo.getCompanySizeId() != null) {
                 SysDictData sysDictData = dictDataService.selectDictDataById(companyVo.getCompanyTypeId());
@@ -251,12 +227,10 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
 
     @Override
     public RecruitCompanyNeedVo queryNeedsId(Long companyId) {
-        if (companyId == 0){
-            String TenantId = ServletUtils.getRequest().getHeader("TenantId");
             RecruitCompanyQueryBo recruitCompanyQueryBo = new RecruitCompanyQueryBo();
-            recruitCompanyQueryBo.setTenantId(Convert.toLong(TenantId));
-            RecruitCompanyVo companyList = baseMapper.selectCompanyList(recruitCompanyQueryBo);
-            RecruitCompanyNeedVo recruitCompanyNeedVo = BeanUtil.toBean(companyList, RecruitCompanyNeedVo.class);
+            recruitCompanyQueryBo.setCompanyId(companyId);
+            List<RecruitCompanyVo> recruitCompanyVos = baseMapper.selectLimt(recruitCompanyQueryBo);
+            RecruitCompanyNeedVo recruitCompanyNeedVo = BeanUtil.toBean(recruitCompanyVos.get(0), RecruitCompanyNeedVo.class);
             if (recruitCompanyNeedVo.getCompanyTypeId() != null && recruitCompanyNeedVo.getCompanySizeId() != null) {
                 SysDictData sysDictData = dictDataService.selectDictDataById(recruitCompanyNeedVo.getCompanyTypeId());
                 SysDictData sysDictData1 = dictDataService.selectDictDataById(recruitCompanyNeedVo.getCompanySizeId());
@@ -271,25 +245,6 @@ public class RecruitCompanyServiceImpl extends ServiceImpl<RecruitCompanyMapper,
             List<RecruitNeeds> list = iRecruitNeedsService.queryRecruitNeedsListString(recruitNeedsQueryBo);
             recruitCompanyNeedVo.setRecruitNeedsVoList(list);
             return recruitCompanyNeedVo;
-        }else {
-            RecruitCompany db = this.baseMapper.selectById(companyId);
-            RecruitCompanyNeedVo recruitCompanyNeedVo = BeanUtil.toBean(db, RecruitCompanyNeedVo.class);
-            if (recruitCompanyNeedVo.getCompanyTypeId() != null && recruitCompanyNeedVo.getCompanySizeId() != null) {
-                SysDictData sysDictData = dictDataService.selectDictDataById(recruitCompanyNeedVo.getCompanyTypeId());
-                SysDictData sysDictData1 = dictDataService.selectDictDataById(recruitCompanyNeedVo.getCompanySizeId());
-                recruitCompanyNeedVo.setCompanyType(sysDictData.getDictLabel());
-                recruitCompanyNeedVo.setCompanySize(sysDictData1.getDictLabel());
-            }
-            RecruitNeedsQueryBo recruitNeedsQueryBo = new RecruitNeedsQueryBo();
-            recruitNeedsQueryBo.setCompanyId(companyId);
-            List<Integer> statusList = new ArrayList<>();
-            statusList.add(2);
-            recruitNeedsQueryBo.setStatus(statusList);
-            List<RecruitNeeds> list = iRecruitNeedsService.queryRecruitNeedsListString(recruitNeedsQueryBo);
-            recruitCompanyNeedVo.setRecruitNeedsVoList(list);
-            return recruitCompanyNeedVo;
-        }
-
     }
 
     /**

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

@@ -111,7 +111,8 @@ 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="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>