From 1e4928d3e6d426395b65ad984560f3e010ec26b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=AE=9D=E9=BE=99?= Date: Fri, 3 Jul 2026 13:42:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/constant/enums/ModelTemplateTypeEnum.java | 6 ++++++ ...SupplyMonitorIndustryPopulationController.java | 13 +++++++++++++ ...pplyMonitorOccupationPopulationController.java | 13 +++++++++++++ .../ModelSupplyMonitorPopulationController.java | 15 +++++++++++++++ .../cms/service/impl/ModelCommonServiceImpl.java | 3 +++ 5 files changed, 50 insertions(+) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/enums/ModelTemplateTypeEnum.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/enums/ModelTemplateTypeEnum.java index 4d2c5ad..cb089cb 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/enums/ModelTemplateTypeEnum.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/enums/ModelTemplateTypeEnum.java @@ -17,6 +17,8 @@ public enum ModelTemplateTypeEnum { MODEL_SUPPLY_MONITOR_POPULATION("劳动力动态监测系统-劳动力供给预测人口"), + MODEL_SUPPLY_MONITOR_POPULATION_RESULT("劳动力动态监测系统-劳动力供给结果分年龄劳动力总人口"), + MODEL_SUPPLY_MONITOR_TOTAL_FERTILITY_RATE("劳动力动态监测系统-劳动力供给预测总和生育率"), MODEL_SUPPLY_MONITOR_LABOR_JOIN_RATE("劳动力动态监测系统-劳动力供给劳动参与率"), @@ -24,6 +26,10 @@ public enum ModelTemplateTypeEnum { MODEL_SUPPLY_MONITOR_INDUSTRY_POPULATION("劳动力动态监测系统-劳动力供给分行业劳动力人口"), MODEL_SUPPLY_MONITOR_OCCUPATION_POPULATION("劳动力动态监测系统-劳动力供给分职业劳动力人口"), + + MODEL_SUPPLY_MONITOR_INDUSTRY_POPULATION_RESULT("劳动力动态监测系统-劳动力供给结果分行业劳动力人口"), + + MODEL_SUPPLY_MONITOR_OCCUPATION_POPULATION_RESULT("劳动力动态监测系统-劳动力供给结果分职业劳动力人口"), ; private final String desc; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorIndustryPopulationController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorIndustryPopulationController.java index 3b20e90..62c128b 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorIndustryPopulationController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorIndustryPopulationController.java @@ -101,4 +101,17 @@ public class ModelSupplyMonitorIndustryPopulationController extends BaseControll modelSupplyMonitorIndustryPopulationService.list(modelSupplyMonitorIndustryPopulation); return AjaxResult.success(list); } + + /** + * 查询结果列表 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + * @return 列表 + */ + @PostMapping("/listResult") + public AjaxResult listResult(@RequestBody ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation) { + List list = + modelSupplyMonitorIndustryPopulationService.list(modelSupplyMonitorIndustryPopulation); + return AjaxResult.success(list); + } } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorOccupationPopulationController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorOccupationPopulationController.java index 2e855ea..413c5db 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorOccupationPopulationController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorOccupationPopulationController.java @@ -101,4 +101,17 @@ public class ModelSupplyMonitorOccupationPopulationController extends BaseContro modelSupplyMonitorOccupationPopulationService.list(modelSupplyMonitorOccupationPopulation); return AjaxResult.success(list); } + + /** + * 查询结果列表 + * + * @param modelSupplyMonitorOccupationPopulation 劳动力供给分职业劳动力人口 + * @return 列表 + */ + @PostMapping("/listResult") + public AjaxResult listResult(@RequestBody ModelSupplyMonitorOccupationPopulation modelSupplyMonitorOccupationPopulation) { + List list = + modelSupplyMonitorOccupationPopulationService.list(modelSupplyMonitorOccupationPopulation); + return AjaxResult.success(list); + } } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorPopulationController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorPopulationController.java index edd139f..db75346 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorPopulationController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorPopulationController.java @@ -103,4 +103,19 @@ public class ModelSupplyMonitorPopulationController extends BaseController { modelSupplyMonitorPopulationService.list(modelSupplyMonitorPopulation); return AjaxResult.success(list); } + + /** + * 查询结果列表 + * + * @param modelSupplyMonitorPopulation 劳动力供给人口 + * @return 列表 + */ + @PostMapping("/listResult") + @ResponseBody + public AjaxResult listResult(@RequestBody ModelSupplyMonitorPopulation modelSupplyMonitorPopulation) { + // todo 先用人口 + List list = + modelSupplyMonitorPopulationService.list(modelSupplyMonitorPopulation); + return AjaxResult.success(list); + } } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelCommonServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelCommonServiceImpl.java index b7b8529..c92bcd3 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelCommonServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelCommonServiceImpl.java @@ -115,6 +115,7 @@ public class ModelCommonServiceImpl implements ModelCommonService { modelWarningIndicatorDataService.exportExcel(response, dto); break; case MODEL_SUPPLY_MONITOR_POPULATION: + case MODEL_SUPPLY_MONITOR_POPULATION_RESULT: modelSupplyMonitorPopulationService.exportExcel(response, dto); break; case MODEL_SUPPLY_MONITOR_TOTAL_FERTILITY_RATE: @@ -124,9 +125,11 @@ public class ModelCommonServiceImpl implements ModelCommonService { modelSupplyMonitorLaborJoinRateService.exportExcel(response, dto); break; case MODEL_SUPPLY_MONITOR_INDUSTRY_POPULATION: + case MODEL_SUPPLY_MONITOR_INDUSTRY_POPULATION_RESULT: modelSupplyMonitorIndustryPopulationService.exportExcel(response, dto); break; case MODEL_SUPPLY_MONITOR_OCCUPATION_POPULATION: + case MODEL_SUPPLY_MONITOR_OCCUPATION_POPULATION_RESULT: modelSupplyMonitorOccupationPopulationService.exportExcel(response, dto); break; default: