添加功能

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;
 }

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<ModelSupplyMonitorIndustryPopulation> list =
+                modelSupplyMonitorIndustryPopulationService.list(modelSupplyMonitorIndustryPopulation);
+        return AjaxResult.success(list);
+    }
 }

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<ModelSupplyMonitorOccupationPopulation> list =
+                modelSupplyMonitorOccupationPopulationService.list(modelSupplyMonitorOccupationPopulation);
+        return AjaxResult.success(list);
+    }
 }

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<ModelSupplyMonitorPopulation> list =
+                modelSupplyMonitorPopulationService.list(modelSupplyMonitorPopulation);
+        return AjaxResult.success(list);
+    }
 }

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: