From 631c4fdc21e9a31c0717ad8f1cdae1d2050f7a5d 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:15:14 +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 --- .../constant/enums/ModelTemplateTypeEnum.java | 2 + ...lyMonitorIndustryPopulationController.java | 104 +++++++++ .../ModelSupplyMonitorIndustryPopulation.java | 53 +++++ ...SupplyMonitorIndustryPopulationMapper.java | 64 ++++++ ...upplyMonitorIndustryPopulationService.java | 75 +++++++ .../service/impl/ModelCommonServiceImpl.java | 7 + ...yMonitorIndustryPopulationServiceImpl.java | 204 ++++++++++++++++++ ...lSupplyMonitorIndustryPopulationMapper.xml | 82 +++++++ ...动态监测系统-劳动力供给分行业劳动力人口.xlsx | Bin 0 -> 10410 bytes sql/datadashboard/table.sql | 39 +++- 10 files changed, 629 insertions(+), 1 deletion(-) create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorIndustryPopulationController.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ModelSupplyMonitorIndustryPopulation.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ModelSupplyMonitorIndustryPopulationMapper.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ModelSupplyMonitorIndustryPopulationService.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelSupplyMonitorIndustryPopulationServiceImpl.java create mode 100644 ruoyi-bussiness/src/main/resources/mapper/ModelSupplyMonitorIndustryPopulationMapper.xml create mode 100644 ruoyi-bussiness/src/main/resources/template/劳动力动态监测系统-劳动力供给分行业劳动力人口.xlsx 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 714265a..254d24f 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 @@ -20,6 +20,8 @@ public enum ModelTemplateTypeEnum { MODEL_SUPPLY_MONITOR_TOTAL_FERTILITY_RATE("劳动力动态监测系统-劳动力供给预测总和生育率"), MODEL_SUPPLY_MONITOR_LABOR_JOIN_RATE("劳动力动态监测系统-劳动力供给劳动参与率"), + + MODEL_SUPPLY_MONITOR_INDUSTRY_POPULATION("劳动力动态监测系统-劳动力供给分行业劳动力人口"), ; 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 new file mode 100644 index 0000000..3b20e90 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorIndustryPopulationController.java @@ -0,0 +1,104 @@ +package com.ruoyi.cms.controller; + +import com.ruoyi.cms.domain.ModelSupplyMonitorIndustryPopulation; +import com.ruoyi.cms.service.ModelSupplyMonitorIndustryPopulationService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.List; + +/** + * 劳动力供给分行业劳动力人口 + * + * @author 马宝龙 + * @date 2026/7/3 + */ +@RestController +@RequestMapping("/model/supplyMonitorIndustryPopulation") +@RequiredArgsConstructor +public class ModelSupplyMonitorIndustryPopulationController extends BaseController { + + private final ModelSupplyMonitorIndustryPopulationService modelSupplyMonitorIndustryPopulationService; + + /** + * 创建 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + * @return 创建结果 + */ + @PostMapping("/create") + public AjaxResult create(@Valid @RequestBody ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation) { + modelSupplyMonitorIndustryPopulationService.create(modelSupplyMonitorIndustryPopulation); + return AjaxResult.success(); + } + + /** + * 更新 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + * @return 更新结果 + */ + @PutMapping("/update") + public AjaxResult update(@Valid @RequestBody ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation) { + modelSupplyMonitorIndustryPopulationService.update(modelSupplyMonitorIndustryPopulation); + return AjaxResult.success(); + } + + /** + * 删除 + * + * @param id ID + * @return 删除结果 + */ + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam Long id) { + modelSupplyMonitorIndustryPopulationService.delete(id); + return AjaxResult.success(); + } + + /** + * 清空 + * + * @return 清空结果 + */ + @DeleteMapping("/clear") + public AjaxResult clear() { + modelSupplyMonitorIndustryPopulationService.clear(); + return AjaxResult.success(); + } + + /** + * 查询详情 + * + * @param id ID + * @return 劳动力供给分行业劳动力人口 + */ + @GetMapping("/detail") + public AjaxResult detail(@RequestParam Long id) { + ModelSupplyMonitorIndustryPopulation data = modelSupplyMonitorIndustryPopulationService.detail(id); + return AjaxResult.success(data); + } + + /** + * 查询列表 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + * @return 列表 + */ + @PostMapping("/list") + public AjaxResult list(@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/domain/ModelSupplyMonitorIndustryPopulation.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ModelSupplyMonitorIndustryPopulation.java new file mode 100644 index 0000000..7bd8df0 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ModelSupplyMonitorIndustryPopulation.java @@ -0,0 +1,53 @@ +package com.ruoyi.cms.domain; + +import com.ruoyi.common.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 劳动力供给分行业劳动力人口 + * + * @author 马宝龙 + * @date 2026/7/3 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ModelSupplyMonitorIndustryPopulation implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + /** + * 年份 + */ + @Excel(name = "年份") + private Integer year; + /** + * 行业编号 + */ + @Excel(name = "行业编号") + private String industryCode; + /** + * 行业名称 + */ + @Excel(name = "行业名称") + private String industryName; + /** + * 男性人数 + */ + @Excel(name = "男性人数") + private Integer maleCount; + /** + * 女性人数 + */ + @Excel(name = "女性人数") + private Integer femaleCount; +} \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ModelSupplyMonitorIndustryPopulationMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ModelSupplyMonitorIndustryPopulationMapper.java new file mode 100644 index 0000000..8a3c515 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ModelSupplyMonitorIndustryPopulationMapper.java @@ -0,0 +1,64 @@ +package com.ruoyi.cms.mapper; + +import com.ruoyi.cms.domain.ModelSupplyMonitorIndustryPopulation; + +import java.util.List; + +/** + * 劳动力供给分行业劳动力人口 + * + * @author 马宝龙 + * @date 2026/7/3 + */ +public interface ModelSupplyMonitorIndustryPopulationMapper { + + /** + * 新增 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + */ + void insert(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation); + + /** + * 修改 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + */ + void update(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation); + + /** + * 通过ID删除 + * + * @param id ID + */ + void deleteById(Long id); + + /** + * 清空 + */ + void clear(); + + /** + * 通过ID查询 + * + * @param id ID + * @return 劳动力供给分行业劳动力人口 + */ + ModelSupplyMonitorIndustryPopulation selectById(Long id); + + /** + * 查询唯一（按年份+行业编号） + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + * @return 劳动力供给分行业劳动力人口 + */ + ModelSupplyMonitorIndustryPopulation findUnique(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation); + + /** + * 查询列表 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + * @return 列表 + */ + List list(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation); +} \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ModelSupplyMonitorIndustryPopulationService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ModelSupplyMonitorIndustryPopulationService.java new file mode 100644 index 0000000..55fceac --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ModelSupplyMonitorIndustryPopulationService.java @@ -0,0 +1,75 @@ +package com.ruoyi.cms.service; + +import com.ruoyi.cms.domain.ModelSupplyMonitorIndustryPopulation; +import com.ruoyi.cms.domain.dto.ModelExportParamDto; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 劳动力供给分行业劳动力人口 + * + * @author 马宝龙 + * @date 2026/7/3 + */ +public interface ModelSupplyMonitorIndustryPopulationService { + + /** + * 创建 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + */ + void create(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation); + + /** + * 更新 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + */ + void update(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation); + + /** + * 删除 + * + * @param id ID + */ + void delete(Long id); + + /** + * 清空 + */ + void clear(); + + /** + * 查询详情 + * + * @param id ID + * @return 劳动力供给分行业劳动力人口 + */ + ModelSupplyMonitorIndustryPopulation detail(Long id); + + /** + * 查询列表 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + * @return 列表 + */ + List list(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation); + + /** + * 导入数据 + * + * @param file 文件 + * @return 导入结果 + */ + String importExcel(MultipartFile file); + + /** + * 导出数据 + * + * @param response 响应体 + * @param dto 导出参数 + */ + void exportExcel(HttpServletResponse response, ModelExportParamDto dto); +} \ 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 20635db..e9208f1 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 @@ -3,6 +3,7 @@ package com.ruoyi.cms.service.impl; import com.ruoyi.cms.constant.enums.ModelTemplateTypeEnum; import com.ruoyi.cms.domain.dto.ModelExportParamDto; import com.ruoyi.cms.service.ModelCommonService; +import com.ruoyi.cms.service.ModelSupplyMonitorIndustryPopulationService; import com.ruoyi.cms.service.ModelSupplyMonitorLaborJoinRateService; import com.ruoyi.cms.service.ModelSupplyMonitorPopulationService; import com.ruoyi.cms.service.ModelSupplyMonitorTotalFertilityRateService; @@ -40,6 +41,7 @@ public class ModelCommonServiceImpl implements ModelCommonService { private final ModelSupplyMonitorPopulationService modelSupplyMonitorPopulationService; private final ModelSupplyMonitorTotalFertilityRateService modelSupplyMonitorTotalFertilityRateService; private final ModelSupplyMonitorLaborJoinRateService modelSupplyMonitorLaborJoinRateService; + private final ModelSupplyMonitorIndustryPopulationService modelSupplyMonitorIndustryPopulationService; @Override public void template(HttpServletResponse response, @@ -91,6 +93,8 @@ public class ModelCommonServiceImpl implements ModelCommonService { return modelSupplyMonitorTotalFertilityRateService.importExcel(file); case MODEL_SUPPLY_MONITOR_LABOR_JOIN_RATE: return modelSupplyMonitorLaborJoinRateService.importExcel(file); + case MODEL_SUPPLY_MONITOR_INDUSTRY_POPULATION: + return modelSupplyMonitorIndustryPopulationService.importExcel(file); default: throw new ServiceException("模板类型错误"); } @@ -115,6 +119,9 @@ public class ModelCommonServiceImpl implements ModelCommonService { case MODEL_SUPPLY_MONITOR_LABOR_JOIN_RATE: modelSupplyMonitorLaborJoinRateService.exportExcel(response, dto); break; + case MODEL_SUPPLY_MONITOR_INDUSTRY_POPULATION: + modelSupplyMonitorIndustryPopulationService.exportExcel(response, dto); + break; default: throw new ServiceException("模板类型错误"); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelSupplyMonitorIndustryPopulationServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelSupplyMonitorIndustryPopulationServiceImpl.java new file mode 100644 index 0000000..a7b6e17 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelSupplyMonitorIndustryPopulationServiceImpl.java @@ -0,0 +1,204 @@ +package com.ruoyi.cms.service.impl; + +import com.ruoyi.cms.constant.enums.ModelTemplateTypeEnum; +import com.ruoyi.cms.domain.ModelSupplyMonitorIndustryPopulation; +import com.ruoyi.cms.domain.dto.ModelExportParamDto; +import com.ruoyi.cms.mapper.ModelSupplyMonitorIndustryPopulationMapper; +import com.ruoyi.cms.service.ModelSupplyMonitorIndustryPopulationService; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.bean.BeanValidators; +import com.ruoyi.common.utils.poi.ExcelUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Validator; +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +/** + * 劳动力供给分行业劳动力人口 + * + * @author 马宝龙 + * @date 2026/7/3 + */ +@Slf4j +@Service +@Validated +@RequiredArgsConstructor +public class ModelSupplyMonitorIndustryPopulationServiceImpl implements ModelSupplyMonitorIndustryPopulationService { + + private final ModelSupplyMonitorIndustryPopulationMapper modelSupplyMonitorIndustryPopulationMapper; + private final Validator validator; + + @Override + public void create(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation) { + + check(modelSupplyMonitorIndustryPopulation); + + // 查询唯一（按年份+行业编号） + Optional optional = findUnique(modelSupplyMonitorIndustryPopulation); + if (optional.isPresent()) { + // 更新 + ModelSupplyMonitorIndustryPopulation exists = optional.get(); + modelSupplyMonitorIndustryPopulation.setId(exists.getId()); + modelSupplyMonitorIndustryPopulationMapper.update(modelSupplyMonitorIndustryPopulation); + } else { + // 新增 + modelSupplyMonitorIndustryPopulationMapper.insert(modelSupplyMonitorIndustryPopulation); + } + } + + /** + * 检查 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + */ + void check(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation) { + if (Objects.isNull(modelSupplyMonitorIndustryPopulation.getYear())) { + throw new ServiceException("年份不能为空"); + } + if (StringUtils.isBlank(modelSupplyMonitorIndustryPopulation.getIndustryCode())) { + throw new ServiceException("行业编号不能为空"); + } + if (StringUtils.isBlank(modelSupplyMonitorIndustryPopulation.getIndustryName())) { + throw new ServiceException("行业名称不能为空"); + } + if (Objects.isNull(modelSupplyMonitorIndustryPopulation.getMaleCount())) { + throw new ServiceException("男性人数不能为空"); + } + if (Objects.isNull(modelSupplyMonitorIndustryPopulation.getFemaleCount())) { + throw new ServiceException("女性人数不能为空"); + } + } + + @Override + public void update(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation) { + + check(modelSupplyMonitorIndustryPopulation); + + if (Objects.isNull(modelSupplyMonitorIndustryPopulation.getId())) { + throw new ServiceException("id不能为空"); + } + Optional unique = findUnique(modelSupplyMonitorIndustryPopulation); + if (!unique.isPresent()) { + modelSupplyMonitorIndustryPopulationMapper.update(modelSupplyMonitorIndustryPopulation); + return; + } + ModelSupplyMonitorIndustryPopulation exists = unique.get(); + if (!exists.getId().equals(modelSupplyMonitorIndustryPopulation.getId())) { + throw new ServiceException("数据已存在"); + } + modelSupplyMonitorIndustryPopulationMapper.update(modelSupplyMonitorIndustryPopulation); + } + + @Override + public void delete(Long id) { + if (Objects.isNull(id)) { + throw new ServiceException("id不能为空"); + } + modelSupplyMonitorIndustryPopulationMapper.deleteById(id); + } + + @Override + public void clear() { + modelSupplyMonitorIndustryPopulationMapper.clear(); + } + + @Override + public ModelSupplyMonitorIndustryPopulation detail(Long id) { + if (Objects.isNull(id)) { + throw new ServiceException("id不能为空"); + } + return modelSupplyMonitorIndustryPopulationMapper.selectById(id); + } + + /** + * 查询唯一 + * + * @param modelSupplyMonitorIndustryPopulation 劳动力供给分行业劳动力人口 + * @return 劳动力供给分行业劳动力人口 + */ + private Optional findUnique(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation) { + ModelSupplyMonitorIndustryPopulation unique = + modelSupplyMonitorIndustryPopulationMapper.findUnique(modelSupplyMonitorIndustryPopulation); + return Optional.ofNullable(unique); + } + + @Override + public List list(ModelSupplyMonitorIndustryPopulation modelSupplyMonitorIndustryPopulation) { + return modelSupplyMonitorIndustryPopulationMapper.list(modelSupplyMonitorIndustryPopulation); + } + + @Override + public String importExcel(MultipartFile file) { + try { + ExcelUtil util = new ExcelUtil<>(ModelSupplyMonitorIndustryPopulation.class); + List list = util.importExcel(file.getInputStream()); + + ModelSupplyMonitorIndustryPopulation exists; + int successNum = 0; + int failureNum = 0; + StringBuilder successMsg = new StringBuilder(); + StringBuilder failureMsg = new StringBuilder(); + for (ModelSupplyMonitorIndustryPopulation item : list) { + try { + check(item); + exists = modelSupplyMonitorIndustryPopulationMapper.findUnique(item); + if (exists == null) { + BeanValidators.validateWithException(validator, item); + modelSupplyMonitorIndustryPopulationMapper.insert(item); + successNum++; + String msg = + "
" + successNum + "、" + "年份：" + item.getYear() + "行业：" + item.getIndustryName() + "数据导入成功。"; + successMsg.append(msg); + } else { + item.setId(exists.getId()); + BeanValidators.validateWithException(validator, item); + modelSupplyMonitorIndustryPopulationMapper.update(item); + successNum++; + String msg = + "
" + successNum + "、" + "年份：" + item.getYear() + "行业：" + item.getIndustryName() + "数据更新成功。"; + successMsg.append(msg); + } + } catch (Exception e) { + failureNum++; + String msg = "
" + failureNum + "、" + "年份：" + item.getYear() + "行业：" + item.getIndustryName() + "数据导入失败："; + failureMsg.append(msg).append(e.getMessage()); + log.error(msg, e); + } + } + if (failureNum > 0) { + failureMsg.insert(0, "导入失败！共 " + failureNum + " 条数据出现问题，错误如下："); + throw new ServiceException(failureMsg.toString()); + } else { + successMsg.insert(0, "数据已全部导入成功！共 " + successNum + " 条："); + } + return successMsg.toString(); + } catch (Exception e) { + log.error("数据导入失败", e); + throw new ServiceException("数据导入失败"); + } + } + + @Override + public void exportExcel(HttpServletResponse response, ModelExportParamDto dto) { + try { + + List list = list(ModelSupplyMonitorIndustryPopulation.builder() + .year(dto.getYear()) + .build()); + ExcelUtil util = new ExcelUtil<>(ModelSupplyMonitorIndustryPopulation.class); + util.exportExcel(response, list, ModelTemplateTypeEnum.MODEL_SUPPLY_MONITOR_INDUSTRY_POPULATION.getDesc()); + + } catch (Exception e) { + log.error("数据导出失败", e); + throw new ServiceException("数据导出失败"); + } + } +} \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/resources/mapper/ModelSupplyMonitorIndustryPopulationMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/ModelSupplyMonitorIndustryPopulationMapper.xml new file mode 100644 index 0000000..f197424 --- /dev/null +++ b/ruoyi-bussiness/src/main/resources/mapper/ModelSupplyMonitorIndustryPopulationMapper.xml @@ -0,0 +1,82 @@ + + + + + + INSERT INTO model_supply_monitor_industry_population (year, industry_code, industry_name, male_count, female_count) + VALUES (#{year}, #{industryCode}, #{industryName}, #{maleCount}, #{femaleCount}) + + + + UPDATE model_supply_monitor_industry_population + SET year = #{year}, + industry_code = #{industryCode}, + industry_name = #{industryName}, + male_count = #{maleCount}, + female_count = #{femaleCount} + WHERE id = #{id} + + + + DELETE + FROM model_supply_monitor_industry_population + WHERE id = #{id} + + + + DELETE FROM model_supply_monitor_industry_population + WHERE id IS NOT NULL; + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/resources/template/劳动力动态监测系统-劳动力供给分行业劳动力人口.xlsx b/ruoyi-bussiness/src/main/resources/template/劳动力动态监测系统-劳动力供给分行业劳动力人口.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..e83348bbb94954ee8051daa08933d8d491e39e9b GIT binary patch literal 10410 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 bl%EIG%5ty|Q4DyIz=ntc_ZgD%;pzVXYuf%Q literal 0 HcmV?d00001 diff --git a/sql/datadashboard/table.sql b/sql/datadashboard/table.sql index 51c11c9..100034d 100644 --- a/sql/datadashboard/table.sql +++ b/sql/datadashboard/table.sql @@ -959,4 +959,41 @@ COMMENT ON COLUMN shz_data_dashboard.model_supply_monitor_labor_join_rate.female_labor_join_rate IS '女性劳动参与率（%）'; COMMENT -ON TABLE shz_data_dashboard.model_supply_monitor_labor_join_rate IS '劳动力供给劳动参与率'; \ No newline at end of file +ON TABLE shz_data_dashboard.model_supply_monitor_labor_join_rate IS '劳动力供给劳动参与率'; + + +--劳动力供给分行业劳动力人口 +CREATE TABLE shz_data_dashboard.model_supply_monitor_industry_population +( + id serial PRIMARY KEY, + year integer NOT NULL, + industry_code character varying(200) NOT NULL COLLATE pg_catalog."default", + industry_name character varying(200) NOT NULL COLLATE pg_catalog."default", + male_count integer NOT NULL, + female_count integer NOT NULL +) +; + +ALTER TABLE shz_data_dashboard.model_supply_monitor_industry_population + OWNER TO sysdba; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_industry_population.id IS '主键'; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_industry_population.year IS '年份'; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_industry_population.industry_code IS '行业编号'; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_industry_population.industry_name IS '行业名称'; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_industry_population.male_count IS '男性人数'; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_industry_population.female_count IS '女性人数'; + +COMMENT +ON TABLE shz_data_dashboard.model_supply_monitor_industry_population IS '劳动力供给分行业劳动力人口'; \ No newline at end of file