更新火苗儿企业的返回数据

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vo/EnterpriseBaseSimpleRespVO.java

@@ -22,9 +22,14 @@ public class EnterpriseBaseSimpleRespVO {
     @Schema(description = "所在行业", example = "123")
     private Long industryId;
 
+    private String industryName;
+
     @Schema(description = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）", example = "1")
     private String scale;
 
+    private String scaleName;
+
+
     @Schema(description = "融资阶段（未融资，天使轮，A轮，B轮，C轮，D轮以上，已上市，不需要融资）", example = "1")
     private String financingStatus;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vo/EnterpriseRespVO.java

@@ -1,5 +1,6 @@
 package com.citu.module.menduner.system.controller.base.enterprise.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.citu.framework.excel.core.annotations.DictFormat;
@@ -60,6 +61,12 @@ public class EnterpriseRespVO {
     @ExcelProperty("所在行业")
     private Long industryId;
 
+    @Schema(description = "所在行业中文", example = "16657")
+//    @ExcelProperty("所在行业")
+    @ExcelIgnore
+    private String industryName;
+
+
     @Schema(description = "融资阶段（未融资，天使轮，A轮，B轮，C轮，D轮以上，已上市，不需要融资）", example = "2")
     @ExcelProperty(value = "融资阶段（未融资，天使轮，A轮，B轮，C轮，D轮以上，已上市，不需要融资）", converter = DictConvert.class)
     @DictFormat(MENDUNER_FINANCING_STATUS)
@@ -69,6 +76,10 @@ public class EnterpriseRespVO {
     @ExcelProperty(value = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）", converter = DictConvert.class)
     @DictFormat(MENDUNER_SCALE)
     private String scale;
+    @Schema(description = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）")
+    @ExcelProperty(value = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）", converter = DictConvert.class)
+    @DictFormat(MENDUNER_SCALE)
+    private String scaleName;
 
     @Schema(description = "企业福利")
     @ExcelProperty("企业福利")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java

@@ -11,6 +11,7 @@ import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.api.python.GraphSendDTO;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseClickReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseDetailRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.enterprise.vo.*;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.*;
@@ -18,16 +19,19 @@ import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAddressDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseAddressMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseBusinessMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
+import com.citu.module.menduner.system.enums.DictTypeConstants;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.enums.sync.SyncConstants;
 import com.citu.module.menduner.system.enums.visits.MdeVisitsEnum;
 import com.citu.module.menduner.system.mq.producer.ESProducer;
 import com.citu.module.menduner.system.mq.producer.GraphProducer;
 import com.citu.module.menduner.system.mq.producer.MdeVisitsProducer;
+import com.citu.module.menduner.system.service.industry.IndustryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -71,6 +75,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     @Resource
     private GraphProducer graphProducer;
 
+    @Resource
+    private IndustryService industryService;
+
 
     @Override
     @CacheEvict(cacheNames = {
@@ -272,13 +279,19 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             orDefault.add(enterpriseAddressDO);
             addresseListMap.put(enterpriseAddressDO.getEnterpriseId(), orDefault);
         }
+        Set<Long>  industrysIds =new HashSet<>();
         for (EnterpriseDO enterpriseDO : enterprise) {
             AppEnterpriseDetailRespVO respVO = new AppEnterpriseDetailRespVO();
             respVO.setEnterprise(EnterpriseConvert.INSTANCE.convert3(enterpriseDO));
             respVO.setBusiness(EnterpriseConvert.INSTANCE.convert4(enterpriseBusinessDOMap.get(enterpriseDO.getId())));
             respVO.setAddressList(EnterpriseConvert.INSTANCE.convertList(addresseListMap.get(enterpriseDO.getId())));
+            respVO.getEnterprise().setScaleName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.MENDUNER_SCALE, respVO.getEnterprise().getScale()));
+            industrysIds.add(enterpriseDO.getIndustryId());
             appEnterpriseDetailRespVOS.add(respVO);
         }
+        Map<Long,String> map =   industryService.getIndustryTitleByIds(industrysIds);
+        appEnterpriseDetailRespVOS.forEach(item->item.getEnterprise().setIndustryName(map.get(item.getEnterprise().getIndustryId())));
+
         return appEnterpriseDetailRespVOS;
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprisejob/EnterpriseJobServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.dict.core.DictFrameworkUtils;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseSearchPageReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppEnterpriseJobRespVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedDetailRespVO;
@@ -11,23 +12,25 @@ import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserCon
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
+import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedExtendMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobFairDetailMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobFairMapper;
+import com.citu.module.menduner.system.enums.DictTypeConstants;
 import com.citu.module.menduner.system.service.area.AreaService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
+import com.citu.module.menduner.system.service.industry.IndustryService;
 import com.citu.module.menduner.system.service.job.fair.JobFairService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_JOB_ADVERTISED_NOT_EXISTS;
@@ -52,6 +55,10 @@ public class EnterpriseJobServiceImpl implements EnterpriseJobService {
     @Resource
     private AreaService areaService;
 
+
+    @Resource
+    private IndustryService industryService;
+
     @Override
     public PageResult<AppEnterpriseJobRespVO> getHotEnterpriseJobPage(PageParam pageParam) {
         PageResult<AppEnterpriseJobRespVO> result =
@@ -121,6 +128,16 @@ public class EnterpriseJobServiceImpl implements EnterpriseJobService {
                 resp.setJobList(JobAdvertisedConvert.INSTANCE.convertListSimple(jobList));
             }
         });
+        List<AppEnterpriseJobRespVO> list = result.getList();
+        Set<Long>  industrysIds =new HashSet<>();
+        for (AppEnterpriseJobRespVO appEnterpriseJobRespVO : list) {
+            appEnterpriseJobRespVO.getEnterprise().setScaleName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.MENDUNER_SCALE,appEnterpriseJobRespVO.getEnterprise().getScale()));
+            industrysIds.add(appEnterpriseJobRespVO.getEnterprise().getIndustryId());
+        }
+        Map<Long,String> map =   industryService.getIndustryTitleByIds(industrysIds);
+        list.forEach(item->item.getEnterprise().setIndustryName(map.get(item.getEnterprise().getIndustryId())));
+
+
         return result;
     }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/industry/IndustryService.java

@@ -10,7 +10,10 @@ import com.citu.module.menduner.system.controller.app.jobhunt.industry.vo.AppInd
 import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 
 import javax.validation.Valid;
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 行业信息 Service 接口
@@ -95,4 +98,8 @@ public interface IndustryService {
      * @param reqVO 查询条件
      **/
     List<AppIndustrySimpleRespVO> getIndustryList(AppIndustryListReqVO reqVO);
+
+    List<IndustryDO> getIndustryByIds(Collection<Long> longs);
+
+    Map<Long, String> getIndustryTitleByIds(Set<Long> industrysSet);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/industry/IndustryServiceImpl.java

@@ -286,4 +286,18 @@ public class IndustryServiceImpl implements IndustryService {
     public List<AppIndustrySimpleRespVO> getIndustryList(AppIndustryListReqVO reqVO) {
         return IndustryConvert.INSTANCE.convertList2(industryMapper.selectList(reqVO));
     }
+
+    @Override
+    public List<IndustryDO> getIndustryByIds(Collection<Long> ids) {
+        return industryMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public Map<Long, String> getIndustryTitleByIds(Set<Long> ids) {
+        if(ids.isEmpty()){
+            return new HashMap<>();
+        }
+        List<IndustryDO> industryDOS = industryMapper.selectBatchIds(ids);
+        return industryDOS.stream().collect(Collectors.toMap(IndustryDO::getId, IndustryDO::getNameCn));
+    }
 }