diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/CommonConstant.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/CommonConstant.java index 11ab209..4d2d7e7 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/CommonConstant.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/CommonConstant.java @@ -130,6 +130,29 @@ public class CommonConstant { Tuple2::getT1, Tuple2::getT2 ))); + /** + * 重点产业列表 + */ + public static final List> MAJOR_SECTOR_LIST = + Collections.unmodifiableList(new ArrayList<>(Arrays.asList( + Tuples.of("新材料产业 (碳基、硅基、铝基)", "新材料产业 (碳基、硅基、铝基)"), + Tuples.of("新能源产业", "新能源产业"), + Tuples.of("农业资源转化产业 (农产品精深加工)", "农业资源转化产业 (农产品精深加工)"), + Tuples.of("现代服务业", "现代服务业"), + Tuples.of("绿色算力产业", "绿色算力产业"), + Tuples.of("纺织服装产业", "纺织服装产业"), + Tuples.of("先进装备制造", "先进装备制造"), + Tuples.of("生物医药", "生物医药") + ))); + /** + * 重点产业Map + */ + public static final Map MAJOR_SECTOR_MAP = + Collections.unmodifiableMap(MAJOR_SECTOR_LIST.stream() + .collect(Collectors.toMap( + Tuple2::getT1, + Tuple2::getT2 + ))); /** * 高校类型列表 diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/SectorTalentOverviewVo.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/SectorTalentOverviewVo.java index b8fae9b..32482a3 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/SectorTalentOverviewVo.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/SectorTalentOverviewVo.java @@ -68,6 +68,14 @@ public class SectorTalentOverviewVo implements Serializable { * 人才缺口环比 */ private BigDecimal talentGapCountMom; + /** + * 创业企业数 + */ + private Long startupCompanyCount; + /** + * 创业企业数环比 + */ + private BigDecimal startupCompanyCountMom; /** * 技能培训人数 */ diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ThemeRecruitmentJobMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ThemeRecruitmentJobMapper.java index 256b055..c4db1cc 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ThemeRecruitmentJobMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ThemeRecruitmentJobMapper.java @@ -155,7 +155,7 @@ public interface ThemeRecruitmentJobMapper { * @param dto 查询参数 * @return 结果列表 */ - List majorIndustryRecruitment(QueryParamDto dto); + List majorSectorRecruitment(QueryParamDto dto); /** @@ -164,7 +164,7 @@ public interface ThemeRecruitmentJobMapper { * @param dto 查询参数 * @return 趋势列表 */ - List majorIndustryLaborForceTreadYear(QueryParamDto dto); + List majorSectorLaborForceTreadYear(QueryParamDto dto); /** * 重点监测行业劳动力动态走势 - 季度 @@ -172,7 +172,7 @@ public interface ThemeRecruitmentJobMapper { * @param dto 查询参数 * @return 趋势列表 */ - List majorIndustryLaborForceTreadQuarter(QueryParamDto dto); + List majorSectorLaborForceTreadQuarter(QueryParamDto dto); /** * 重点监测行业劳动力动态走势 - 月度 @@ -180,7 +180,7 @@ public interface ThemeRecruitmentJobMapper { * @param dto 查询参数 * @return 趋势列表 */ - List majorIndustryLaborForceTreadMonth(QueryParamDto dto); + List majorSectorLaborForceTreadMonth(QueryParamDto dto); /** * 不同类型企业用工规模 diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisLaborForceRecruitmentDemandServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisLaborForceRecruitmentDemandServiceImpl.java index 6a01a49..a122536 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisLaborForceRecruitmentDemandServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisLaborForceRecruitmentDemandServiceImpl.java @@ -181,9 +181,9 @@ public class AnalysisLaborForceRecruitmentDemandServiceImpl implements AnalysisL public List majorIndustryRecruitment(QueryParamDto dto) { dealParam(dto); - List list = themeRecruitmentJobMapper.majorIndustryRecruitment(dto); + List list = themeRecruitmentJobMapper.majorSectorRecruitment(dto); MathUtil.calculatePercentage(list); - ParamUtil.fillDictName(list, "majorIndustry"); + ParamUtil.fillDictName(list, "majorSector"); return list; } @@ -201,25 +201,25 @@ public class AnalysisLaborForceRecruitmentDemandServiceImpl implements AnalysisL dto.setStartTime(LocalDateTime.of(dto.getYear(), 1, 1, 0, 0, 0) .minusYears(5L)); dto.setEndTime(LocalDateTime.of(dto.getYear(), 12, 31, 23, 59, 59)); - list = themeRecruitmentJobMapper.majorIndustryLaborForceTreadYear(dto); + list = themeRecruitmentJobMapper.majorSectorLaborForceTreadYear(dto); vo = transform(list,false); - ParamUtil.fillDictName(vo, "majorIndustry"); + ParamUtil.fillDictName(vo, "majorSector"); break; } case QUARTER: { dto.setStartTime(LocalDateTime.of(dto.getYear(), 1, 1, 0, 0, 0)); dto.setEndTime(LocalDateTime.of(dto.getYear(), 12, 31, 23, 59, 59)); - list = themeRecruitmentJobMapper.majorIndustryLaborForceTreadQuarter(dto); + list = themeRecruitmentJobMapper.majorSectorLaborForceTreadQuarter(dto); vo = transform(list,false); - ParamUtil.fillDictName(vo, "majorIndustry"); + ParamUtil.fillDictName(vo, "majorSector"); break; } case MONTH: { dto.setStartTime(LocalDateTime.of(dto.getYear(), 1, 1, 0, 0, 0)); dto.setEndTime(LocalDateTime.of(dto.getYear(), 12, 31, 23, 59, 59)); - list = themeRecruitmentJobMapper.majorIndustryLaborForceTreadMonth(dto); + list = themeRecruitmentJobMapper.majorSectorLaborForceTreadMonth(dto); vo = transform(list,false); - ParamUtil.fillDictName(vo, "majorIndustry"); + ParamUtil.fillDictName(vo, "majorSector"); break; } default: diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/ParamUtil.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/ParamUtil.java index 9320d19..359635e 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/ParamUtil.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/ParamUtil.java @@ -196,6 +196,9 @@ public class ParamUtil { case "majorIndustry": { return Optional.ofNullable(CommonConstant.MAJOR_INDUSTRY_MAP.get(code)).orElse("未知"); } + case "majorSector": { + return Optional.ofNullable(CommonConstant.MAJOR_SECTOR_MAP.get(code)).orElse("未知"); + } case "educationLevel": { return Optional.ofNullable(CommonConstant.EDUCATION_LEVEL_MAP.get(code)).orElse("未知"); } diff --git a/ruoyi-bussiness/src/main/resources/mapper/ThemeRecruitmentJobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/ThemeRecruitmentJobMapper.xml index 5e26eda..158b2b7 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/ThemeRecruitmentJobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/ThemeRecruitmentJobMapper.xml @@ -493,7 +493,7 @@ ORDER BY month_num; - - - -