更新火苗儿

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

@@ -285,7 +285,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             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()));
+            if(null!=respVO.getEnterprise().getScale()) {
+                respVO.getEnterprise().setScaleName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.MENDUNER_SCALE, respVO.getEnterprise().getScale()));
+            }
             industrysIds.add(enterpriseDO.getIndustryId());
             appEnterpriseDetailRespVOS.add(respVO);
         }

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

@@ -131,7 +131,9 @@ public class EnterpriseJobServiceImpl implements EnterpriseJobService {
         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()));
+            if(null!=appEnterpriseJobRespVO.getEnterprise().getScale()) {
+                appEnterpriseJobRespVO.getEnterprise().setScaleName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.MENDUNER_SCALE, appEnterpriseJobRespVO.getEnterprise().getScale()));
+            }
             industrysIds.add(appEnterpriseJobRespVO.getEnterprise().getIndustryId());
         }
         Map<Long,String> map =   industryService.getIndustryTitleByIds(industrysIds);

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

@@ -299,13 +299,12 @@ public class IndustryServiceImpl implements IndustryService {
         }
 
         List<IndustryDO> industryDOS = industryMapper.selectBatchIds(ids);
-        Set<Long> industryParentIds = industryDOS.stream().map(IndustryDO::getParentId).collect(Collectors.toSet());
-        List<IndustryDO> industryPaerntDOS = industryMapper.selectBatchIds(industryParentIds);
+//        List<IndustryDO> industryPaerntDOS = industryMapper.selectBatchIds(industryParentIds);
+//
+//        Map<Long, String> parentMap  = new HashMap<>();
+//        industryPaerntDOS.forEach(item->parentMap.put(item.getId(), item.getNameCn()));
 
-        Map<Long, String> parentMap  = new HashMap<>();
-        industryPaerntDOS.forEach(item->parentMap.put(item.getId(), item.getNameCn()));
-        
 
         return industryDOS.stream().collect(Collectors.toMap(IndustryDO::getId, IndustryDO::getNameCn));
     }
-}
+}//        Set<Long> industryParentIds = industryDOS.stream().map(IndustryDO::getParentId).collect(Collectors.toSet());

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationServiceImpl.java

@@ -45,6 +45,7 @@ import com.citu.module.menduner.system.dal.mysql.position.PositionMapper;
 import com.citu.module.menduner.system.dal.mysql.unfit.UnfitCandidateMapper;
 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.interview.InterviewInviteService;
 import com.citu.module.menduner.system.service.job.fair.JobFairService;
 import com.citu.module.menduner.system.util.ESQueryBuildUtils;
@@ -118,6 +119,9 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
     @Resource
     private JobFairDetailMapper jobFairDetailMapper;
 
+    @Resource
+    private IndustryService industryService;
+
 
     /**
      * 包装职位发布联系人
@@ -423,6 +427,9 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
     @Override
     public PageResult<AppFlameJobRespVO> getFlameJobPage(AppFlameJobPageReqVO reqVO) {
         IPage<AppFlameJobRespVO> pageResult = jobFairDetailMapper.search(MyBatisUtils.buildPage(reqVO), reqVO);
+        Set<Long> industryIds = pageResult.getRecords().stream().map(item -> item.getEnterprise().getIndustryId()).collect(Collectors.toSet());
+        Map<Long, String> industryTitleByIds = industryService.getIndustryTitleByIds(industryIds);
+
         PageResult<AppFlameJobRespVO> result = new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
         for (AppFlameJobRespVO record : result.getList()) {
             if (StringUtils.hasText(record.getJob().getPayUnit())) {
@@ -450,10 +457,14 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
                 record.getEnterprise().setFinancingStatus(DictFrameworkUtils.getDictDataLabel(MENDUNER_FINANCING_STATUS, record.getEnterprise().getFinancingStatus()));
             }
             if (StringUtils.hasText(record.getEnterprise().getScale())) {
+                record.getEnterprise().setScaleName(DictFrameworkUtils.getDictDataLabel(MENDUNER_SCALE, record.getEnterprise().getScale()));
                 record.getEnterprise().setScale(DictFrameworkUtils.getDictDataLabel(MENDUNER_SCALE, record.getEnterprise().getScale()));
             }
+            record.getEnterprise().setIndustryName(industryTitleByIds.get(record.getEnterprise().getIndustryId()));
             record.getJob().setStatus(DictFrameworkUtils.getDictDataLabel(MENDUNER_JOB_STATUS, record.getJob().getStatus()));
         }
+
+
         return result;
     }
 

menduner/menduner-system-biz/src/main/resources/mapper/job/JobFairDetailMapper.xml

@@ -111,7 +111,7 @@
                and f.id = #{reqVO.jobFairId}
            </if>
            <if test="reqVO.content != null and reqVO.content != ''">
-               and (a.name like concat('%',#{content},'%') or e.name like concat('%',#{content},'%')) or e.another_name like concat('%',#{content},'%'))
+               and (a.name like concat('%',#{reqVO.content},'%') or e.name like concat('%',#{reqVO.content},'%')) or e.another_name like concat('%',#{reqVO.content},'%'))
            </if>
            <if test="reqVO.areaId != null and 0!=reqVO.areaId">
                and a.area_id = #{reqVO.areaId}