From d94364f1b0ebc39b78dd2171401b2a66ff118e57 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 16:30:53 +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 + ...odelDemandMonitorEmploymentController.java | 104 +++++++++ .../domain/ModelDemandMonitorEmployment.java | 53 +++++ .../ModelDemandMonitorEmploymentMapper.java | 64 ++++++ .../ModelDemandMonitorEmploymentService.java | 75 +++++++ .../service/impl/ModelCommonServiceImpl.java | 7 + ...delDemandMonitorEmploymentServiceImpl.java | 209 ++++++++++++++++++ .../ModelDemandMonitorEmploymentMapper.xml | 75 +++++++ ...劳动力动态监测系统-劳动力需求就业人数.xlsx | Bin 0 -> 10309 bytes sql/datadashboard/table.sql | 76 ++++++- 10 files changed, 664 insertions(+), 1 deletion(-) create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelDemandMonitorEmploymentController.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ModelDemandMonitorEmployment.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ModelDemandMonitorEmploymentMapper.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ModelDemandMonitorEmploymentService.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelDemandMonitorEmploymentServiceImpl.java create mode 100644 ruoyi-bussiness/src/main/resources/mapper/ModelDemandMonitorEmploymentMapper.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 cb089cb..9147ce2 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 @@ -30,6 +30,8 @@ public enum ModelTemplateTypeEnum { MODEL_SUPPLY_MONITOR_INDUSTRY_POPULATION_RESULT("劳动力动态监测系统-劳动力供给结果分行业劳动力人口"), MODEL_SUPPLY_MONITOR_OCCUPATION_POPULATION_RESULT("劳动力动态监测系统-劳动力供给结果分职业劳动力人口"), + + MODEL_DEMAND_MONITOR_EMPLOYMENT("劳动力动态监测系统-劳动力需求就业人数"), ; private final String desc; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelDemandMonitorEmploymentController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelDemandMonitorEmploymentController.java new file mode 100644 index 0000000..26e650b --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelDemandMonitorEmploymentController.java @@ -0,0 +1,104 @@ +package com.ruoyi.cms.controller; + +import com.ruoyi.cms.domain.ModelDemandMonitorEmployment; +import com.ruoyi.cms.service.ModelDemandMonitorEmploymentService; +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/demandMonitorEmployment") +@RequiredArgsConstructor +public class ModelDemandMonitorEmploymentController extends BaseController { + + private final ModelDemandMonitorEmploymentService modelDemandMonitorEmploymentService; + + /** + * 创建 + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + * @return 创建结果 + */ + @PostMapping("/create") + public AjaxResult create(@Valid @RequestBody ModelDemandMonitorEmployment modelDemandMonitorEmployment) { + modelDemandMonitorEmploymentService.create(modelDemandMonitorEmployment); + return AjaxResult.success(); + } + + /** + * 更新 + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + * @return 更新结果 + */ + @PutMapping("/update") + public AjaxResult update(@Valid @RequestBody ModelDemandMonitorEmployment modelDemandMonitorEmployment) { + modelDemandMonitorEmploymentService.update(modelDemandMonitorEmployment); + return AjaxResult.success(); + } + + /** + * 删除 + * + * @param id ID + * @return 删除结果 + */ + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam Long id) { + modelDemandMonitorEmploymentService.delete(id); + return AjaxResult.success(); + } + + /** + * 清空 + * + * @return 清空结果 + */ + @DeleteMapping("/clear") + public AjaxResult clear() { + modelDemandMonitorEmploymentService.clear(); + return AjaxResult.success(); + } + + /** + * 查询详情 + * + * @param id ID + * @return 劳动力需求就业人数 + */ + @GetMapping("/detail") + public AjaxResult detail(@RequestParam Long id) { + ModelDemandMonitorEmployment data = modelDemandMonitorEmploymentService.detail(id); + return AjaxResult.success(data); + } + + /** + * 查询列表 + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + * @return 列表 + */ + @PostMapping("/list") + public AjaxResult list(@RequestBody ModelDemandMonitorEmployment modelDemandMonitorEmployment) { + List list = + modelDemandMonitorEmploymentService.list(modelDemandMonitorEmployment); + return AjaxResult.success(list); + } +} \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ModelDemandMonitorEmployment.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ModelDemandMonitorEmployment.java new file mode 100644 index 0000000..7f69054 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ModelDemandMonitorEmployment.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 ModelDemandMonitorEmployment implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + /** + * 年份 + */ + @Excel(name = "年份") + private Integer year; + /** + * 总就业人数(万人) + */ + @Excel(name = "总就业人数(万人)") + private Integer totalCount; + /** + * 第一产业就业人数(万人) + */ + @Excel(name = "第一产业就业人数(万人)") + private Integer firstIndustryCount; + /** + * 第二产业就业人数(万人) + */ + @Excel(name = "第二产业就业人数(万人)") + private Integer secondIndustryCount; + /** + * 第三产业就业人数(万人) + */ + @Excel(name = "第三产业就业人数(万人)") + private Integer thirdIndustryCount; +} \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ModelDemandMonitorEmploymentMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ModelDemandMonitorEmploymentMapper.java new file mode 100644 index 0000000..3d03240 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ModelDemandMonitorEmploymentMapper.java @@ -0,0 +1,64 @@ +package com.ruoyi.cms.mapper; + +import com.ruoyi.cms.domain.ModelDemandMonitorEmployment; + +import java.util.List; + +/** + * 劳动力需求就业人数 + * + * @author 马宝龙 + * @date 2026/7/3 + */ +public interface ModelDemandMonitorEmploymentMapper { + + /** + * 新增 + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + */ + void insert(ModelDemandMonitorEmployment modelDemandMonitorEmployment); + + /** + * 修改 + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + */ + void update(ModelDemandMonitorEmployment modelDemandMonitorEmployment); + + /** + * 通过ID删除 + * + * @param id ID + */ + void deleteById(Long id); + + /** + * 清空 + */ + void clear(); + + /** + * 通过ID查询 + * + * @param id ID + * @return 劳动力需求就业人数 + */ + ModelDemandMonitorEmployment selectById(Long id); + + /** + * 查询唯一(按年份) + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + * @return 劳动力需求就业人数 + */ + ModelDemandMonitorEmployment findUnique(ModelDemandMonitorEmployment modelDemandMonitorEmployment); + + /** + * 查询列表 + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + * @return 列表 + */ + List list(ModelDemandMonitorEmployment modelDemandMonitorEmployment); +} \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ModelDemandMonitorEmploymentService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ModelDemandMonitorEmploymentService.java new file mode 100644 index 0000000..aa20b4c --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ModelDemandMonitorEmploymentService.java @@ -0,0 +1,75 @@ +package com.ruoyi.cms.service; + +import com.ruoyi.cms.domain.ModelDemandMonitorEmployment; +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 ModelDemandMonitorEmploymentService { + + /** + * 创建 + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + */ + void create(ModelDemandMonitorEmployment modelDemandMonitorEmployment); + + /** + * 更新 + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + */ + void update(ModelDemandMonitorEmployment modelDemandMonitorEmployment); + + /** + * 删除 + * + * @param id ID + */ + void delete(Long id); + + /** + * 清空 + */ + void clear(); + + /** + * 查询详情 + * + * @param id ID + * @return 劳动力需求就业人数 + */ + ModelDemandMonitorEmployment detail(Long id); + + /** + * 查询列表 + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + * @return 列表 + */ + List list(ModelDemandMonitorEmployment modelDemandMonitorEmployment); + + /** + * 导入数据 + * + * @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 c92bcd3..9eb529c 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.ModelDemandMonitorEmploymentService; import com.ruoyi.cms.service.ModelSupplyMonitorIndustryPopulationService; import com.ruoyi.cms.service.ModelSupplyMonitorLaborJoinRateService; import com.ruoyi.cms.service.ModelSupplyMonitorOccupationPopulationService; @@ -44,6 +45,7 @@ public class ModelCommonServiceImpl implements ModelCommonService { private final ModelSupplyMonitorLaborJoinRateService modelSupplyMonitorLaborJoinRateService; private final ModelSupplyMonitorIndustryPopulationService modelSupplyMonitorIndustryPopulationService; private final ModelSupplyMonitorOccupationPopulationService modelSupplyMonitorOccupationPopulationService; + private final ModelDemandMonitorEmploymentService modelDemandMonitorEmploymentService; @Override public void template(HttpServletResponse response, @@ -99,6 +101,8 @@ public class ModelCommonServiceImpl implements ModelCommonService { return modelSupplyMonitorIndustryPopulationService.importExcel(file); case MODEL_SUPPLY_MONITOR_OCCUPATION_POPULATION: return modelSupplyMonitorOccupationPopulationService.importExcel(file); + case MODEL_DEMAND_MONITOR_EMPLOYMENT: + return modelDemandMonitorEmploymentService.importExcel(file); default: throw new ServiceException("模板类型错误"); } @@ -132,6 +136,9 @@ public class ModelCommonServiceImpl implements ModelCommonService { case MODEL_SUPPLY_MONITOR_OCCUPATION_POPULATION_RESULT: modelSupplyMonitorOccupationPopulationService.exportExcel(response, dto); break; + case MODEL_DEMAND_MONITOR_EMPLOYMENT: + modelDemandMonitorEmploymentService.exportExcel(response, dto); + break; default: throw new ServiceException("模板类型错误"); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelDemandMonitorEmploymentServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelDemandMonitorEmploymentServiceImpl.java new file mode 100644 index 0000000..1e8a04a --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelDemandMonitorEmploymentServiceImpl.java @@ -0,0 +1,209 @@ +package com.ruoyi.cms.service.impl; + +import com.ruoyi.cms.constant.enums.ModelTemplateTypeEnum; +import com.ruoyi.cms.domain.ModelDemandMonitorEmployment; +import com.ruoyi.cms.domain.dto.ModelExportParamDto; +import com.ruoyi.cms.mapper.ModelDemandMonitorEmploymentMapper; +import com.ruoyi.cms.service.ModelDemandMonitorEmploymentService; +import com.ruoyi.common.exception.ServiceException; +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 ModelDemandMonitorEmploymentServiceImpl implements ModelDemandMonitorEmploymentService { + + private final ModelDemandMonitorEmploymentMapper modelDemandMonitorEmploymentMapper; + private final Validator validator; + + @Override + public void create(ModelDemandMonitorEmployment modelDemandMonitorEmployment) { + + check(modelDemandMonitorEmployment); + + // 查询唯一(按年份) + Optional optional = findUnique(modelDemandMonitorEmployment); + if (optional.isPresent()) { + // 更新 + ModelDemandMonitorEmployment exists = optional.get(); + modelDemandMonitorEmployment.setId(exists.getId()); + modelDemandMonitorEmploymentMapper.update(modelDemandMonitorEmployment); + } else { + // 新增 + modelDemandMonitorEmploymentMapper.insert(modelDemandMonitorEmployment); + } + } + + /** + * 检查 + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + */ + void check(ModelDemandMonitorEmployment modelDemandMonitorEmployment) { + if (Objects.isNull(modelDemandMonitorEmployment.getYear())) { + throw new ServiceException("年份不能为空"); + } + if (Objects.isNull(modelDemandMonitorEmployment.getTotalCount())) { + throw new ServiceException("总就业人数不能为空"); + } + if (Objects.isNull(modelDemandMonitorEmployment.getFirstIndustryCount())) { + throw new ServiceException("第一产业就业人数不能为空"); + } + if (Objects.isNull(modelDemandMonitorEmployment.getSecondIndustryCount())) { + throw new ServiceException("第二产业就业人数不能为空"); + } + if (Objects.isNull(modelDemandMonitorEmployment.getThirdIndustryCount())) { + throw new ServiceException("第三产业就业人数不能为空"); + } + if (modelDemandMonitorEmployment.getTotalCount() != + (modelDemandMonitorEmployment.getFirstIndustryCount() + + modelDemandMonitorEmployment.getSecondIndustryCount() + + modelDemandMonitorEmployment.getThirdIndustryCount())) { + throw new ServiceException("总就业人数和第一产业就业人数、第二产业就业人数、第三产业就业人数不相等"); + } + } + + @Override + public void update(ModelDemandMonitorEmployment modelDemandMonitorEmployment) { + + check(modelDemandMonitorEmployment); + + if (Objects.isNull(modelDemandMonitorEmployment.getId())) { + throw new ServiceException("id不能为空"); + } + Optional unique = findUnique(modelDemandMonitorEmployment); + if (!unique.isPresent()) { + modelDemandMonitorEmploymentMapper.update(modelDemandMonitorEmployment); + return; + } + ModelDemandMonitorEmployment exists = unique.get(); + if (!exists.getId().equals(modelDemandMonitorEmployment.getId())) { + throw new ServiceException("数据已存在"); + } + modelDemandMonitorEmploymentMapper.update(modelDemandMonitorEmployment); + } + + @Override + public void delete(Long id) { + if (Objects.isNull(id)) { + throw new ServiceException("id不能为空"); + } + modelDemandMonitorEmploymentMapper.deleteById(id); + } + + @Override + public void clear() { + modelDemandMonitorEmploymentMapper.clear(); + } + + @Override + public ModelDemandMonitorEmployment detail(Long id) { + if (Objects.isNull(id)) { + throw new ServiceException("id不能为空"); + } + return modelDemandMonitorEmploymentMapper.selectById(id); + } + + /** + * 查询唯一 + * + * @param modelDemandMonitorEmployment 劳动力需求就业人数 + * @return 劳动力需求就业人数 + */ + private Optional findUnique(ModelDemandMonitorEmployment modelDemandMonitorEmployment) { + ModelDemandMonitorEmployment unique = + modelDemandMonitorEmploymentMapper.findUnique(modelDemandMonitorEmployment); + return Optional.ofNullable(unique); + } + + @Override + public List list(ModelDemandMonitorEmployment modelDemandMonitorEmployment) { + return modelDemandMonitorEmploymentMapper.list(modelDemandMonitorEmployment); + } + + @Override + public String importExcel(MultipartFile file) { + try { + ExcelUtil util = new ExcelUtil<>(ModelDemandMonitorEmployment.class); + List list = util.importExcel(file.getInputStream()); + + ModelDemandMonitorEmployment exists; + int successNum = 0; + int failureNum = 0; + StringBuilder successMsg = new StringBuilder(); + StringBuilder failureMsg = new StringBuilder(); + for (ModelDemandMonitorEmployment item : list) { + try { + check(item); + exists = modelDemandMonitorEmploymentMapper.findUnique(item); + if (exists == null) { + BeanValidators.validateWithException(validator, item); + modelDemandMonitorEmploymentMapper.insert(item); + successNum++; + String msg = + "
" + successNum + "、" + "年份:" + item.getYear() + "数据导入成功。"; + successMsg.append(msg); + } else { + item.setId(exists.getId()); + BeanValidators.validateWithException(validator, item); + modelDemandMonitorEmploymentMapper.update(item); + successNum++; + String msg = + "
" + successNum + "、" + "年份:" + item.getYear() + "数据更新成功。"; + successMsg.append(msg); + } + } catch (Exception e) { + failureNum++; + String msg = "
" + failureNum + "、" + "年份:" + item.getYear() + "数据导入失败:"; + 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(ModelDemandMonitorEmployment.builder() + .year(dto.getYear()) + .build()); + ExcelUtil util = new ExcelUtil<>(ModelDemandMonitorEmployment.class); + util.exportExcel(response, list, ModelTemplateTypeEnum.MODEL_DEMAND_MONITOR_EMPLOYMENT.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/ModelDemandMonitorEmploymentMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/ModelDemandMonitorEmploymentMapper.xml new file mode 100644 index 0000000..109cafc --- /dev/null +++ b/ruoyi-bussiness/src/main/resources/mapper/ModelDemandMonitorEmploymentMapper.xml @@ -0,0 +1,75 @@ + + + + + + INSERT INTO model_demand_monitor_employment (year, total_count, first_industry_count, second_industry_count, third_industry_count) + VALUES (#{year}, #{totalCount}, #{firstIndustryCount}, #{secondIndustryCount}, #{thirdIndustryCount}) + + + + UPDATE model_demand_monitor_employment + SET year = #{year}, + total_count = #{totalCount}, + first_industry_count = #{firstIndustryCount}, + second_industry_count = #{secondIndustryCount}, + third_industry_count = #{thirdIndustryCount} + WHERE id = #{id} + + + + DELETE + FROM model_demand_monitor_employment + WHERE id = #{id} + + + + DELETE FROM model_demand_monitor_employment + 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..840296dd3c005da0a19225499f1c8bfab90c3180 GIT binary patch literal 10309 zcmeHtby!u~);EpPA`Q|Zy*DM@-AIWb(%o#jL>e|A4brW2cS?7Mz?KxGTN=KNo_o&G zd+vSS@6Y#n-ucH`d#ycUuHTq*%rVCt%5v}sC@}XeNO48@{{FA_5cD$?{xLRAKMi0rt191Y*-tJ>n*iMk)(zB~} zk}XK1YMhy`D-tKlh&nuZx!4h2XHQXA#F)D@uXYF=9F$HCwON3yrKDUzw+0;CRr2#QbQRm=i$8-zQVAO}Y72x`VFe1KZ?-uKsRl|m1lN>(k4*-Rlxr2Ft z0pP~Ggg8xXYxam+Gdg*?5FERlE_Eant^BDuLx7kvuoJx!BS+nUwdXFd`z4O&o&(1- zQf?FsuuSgKw|ww$PTAZhLf@ghuq=j?NfVo*FM#b}(nL^BruMVV9#YXQfE!Vl$)q>e zN#&g(E3)q#HeKnB1#c|4-Y?5o+R=ta^P4t)&6e`?M|-pE+Kr&8ZAj0JVOx_fB+eM} zvh=IsBr|%;EC(JeZV*1#Ln&-kJ3pgd=3BUhV)z6!+&%o274uVv#+NLMws=ncock9z zFnm68xVBz34%%r)$oN;ca$|JAT4U+L-iHfn4SuLK9{t@KhPDpI_vY}5Qc>z4#|cYa;}H*4Gg8k2 z^>;cka9m{UzLDGT71m)&X&ZKQ@s+~n`wy1GjnJHtkolG;1)GV>0x5=qtdZZ~5WG~* zXzt+1JfGigXE@tv%h2IgU&W-|;plEQlC#IAJNv>JQ@($dGZIKZA=Fj6-Ls)TRX5gC zf{<}Et2B`MI*6eby|+<}5T(fR`bsdtK)Tx>aZf~Ynb}#^S%d5Ijaap)vFtb#ZDnE} zZZ3G3fWnqXu(A8X0j}Wi@Gj&yaiN>Ku=j0lY*aGp3ZXJaz0a-71>&zD1KVXDi9td3 zhl2e07m%GCLAKWSFjq&vQt|`f1nxs&&N&;!)XPRKI{;#@21st$pwk;u`NmfnHxS%4 zraF2rSTtE4bB(wSZ-yj{i0$vxkEh~1Y$Jukz?bJrouysUe^vj;uIi(N>e=%H1d=+W zfs-T37IlZUevl3y9t8-_xf_i7fOGyZb2=?NK;h-bz`5DNInmEGPgZk{CfWjg5i$vl zVz?aadXz}G5Ai&XwT-Agk15(t2aRpz9U@;ZRrzhcM`()GSBa-Uc~y}W5cX*J)z(CP z7^T0oVrZyIq2>~}rw4&Mi_~g+=Ij~Xy!_yr>dZ6Z5+-+Byqoi!aM_0_Az>k=rr)Bp z#5)MQ1AzQ|*JIs6^E$Z6WMA#om33AI=?F3UGx|4tcf$;Du!Qw28Hm>7w3+1z zBPEXJOwqHI5Tx@{K0bx_*c_SC#a?F%j-@SKr;h5;0%lZ3spH(iPkrAH$WPA4-d?)- zI7@_-7Y)Clx0K#QC2()PzBV6|zA-|9k$acPMbBKMehlDfdJ~!?%_Mxj+uz_;MIU7Rb93f*NXC;^gzXcwXSBHhoR~=MLM|2eXrSrJaKWl-? z8`W%ZNuFt*U-aREXkfNz2(fQ?tP;jKu0+)8cbJ~uI$VzzB3gN%IP!(-Q^f_sSN_eB z%k{@D`#tL-F=!4ojJvY&KH?@}vBPF`R}{&t{x^S!CBVadu)#GF@r&;Fn~;(7Mvu_K%Tu&!jPs&KF70Oxo4?&u=Zgy#cM?hGNX$ z>5vK`fSZG?CtEB^A_oHE(c1}K;?xJ5+g!bUpDZc5uIA_lO#z=mShFSSdY&J{uQ-E) zl^zuWDS0G{dV-HtJ0S$X%|{d_qxrsFo^{#2x9zUg2q;^jE+%~moqLDvz~qdh^E_+5{KS+oF2SJj+4u_MjtwG< zSevc{EEj*mxHCS9O3&2;=loy;l#^`NE=X85Yjs=oM(r!vxJeCmeTaOm(OFtobBVVA z>mBT`E{OBAeX|zof=r=v;XjOEwjU!nM!|LxfEBneeT_VD)~)q4wm4eNOp}qDT)nF8 zbFw_PrFCREox(tAkNx}ItgoZ0>m6<}8x>{mwLZ_N|TQ zom%AP#2?2*`_jn|lDBq~4a9vO2*8v}mu0RAL^a}3P6`kZvVrsr^CfJlyCz*IxiKqb zgb10xe7%s;&#CaF)w!Ahlv%5zYZoEI$D0HrGt+NjHaqBN3UHOKaOy_bPfLu1bnY(j z9BCw&UV;k*kgVtn$AY!yE@CaqZ%q|d(|vC%nW%2`?eHJ%tk`+v;tJ&2CsSa(FQ)D*q=d8;YSvch9%bI1& zWXtL~qS}mV)wi!Is~n1x+eXNXIs38b@?yjzYoBpVy#><^L=y_gxaX<56qvNg&>xOH zb^D%Hi5C^WmgIrV!M&aX?~{KkekY~yO}$FjL8tGD`_c0;YKy>KY?{24bMb=K|8HZn z|DUn{R~!4E*RlJs8@kYe%#5v#e+#?)FR#$fq03hbboSrJAb*nmApWs>?P?805_96T zQXL9`*T3vh5A`@tSyf+biMq_I$JA_%$)tdZM_i5g8i&xUrKqXJMReZP*$WHjYOFlJ zeIG#i^!XiP+HPN`B1smWe};u3d)lIhH(Bf1brho}88ruYmkw4u*QfEWr)YM(MpV&? zM9aJ0XP;~c9)yfP%3|sYw~LT)b-KGbE6ETbTtz@8PY)HCd|*gl*_`?W=&w)BQh}C# zU_I#imb&SvZ#X!ceKdJA)d6S98C!fDAguytv7dJG=_X(p1F`EPj)k7Io054aW7}9& zj$l~5nF?tN<=g|2v*6UzLwG_YoQDs|i1c%OmWOZSo>V2Es?>{2M{jSvW=TK==NSvo zrK5$)FveNrIxByhfnk`jPj%0q{)l_Y0fQd2lvmz0RkWnjqf!_E?C@3+#T(O>49c#<=TCFXa#}YCLx|M4>^$Ub&2U>PvG)u`CU`rm-gPE9bJ;B`APmv&` zQ%?x_+K3&+z3OP4{ak{??har}hxYhtz8eU}bh00xa@)V@0gutHeu2@^bkusZH!>dL z;~-dRUyH?iIs_5@7&AA_jnPX7M#N&sUKQ~!X2zJ;}=(zuiDQNe3-p}gZx2?v=x!BnYW zAn|9D2@P=cV9;(9M@>0dFugJkBAxu@QqN#9)+vUY@Mbq?kz!Wn?7O5LF>k*0cr^Le z0NBI94V^uxwVCG$RZ$}v$SMCd9W`XGX$Wn9&Y6mTsZ*Ojh;hjM@t)6Y*1TDKn%;-d zQ<|+;LEbZ&9knfDwgq2(T3A`Nfgtm0LXLUs<_pDZk9}Zf72O67*~8`=ys}Gh1K@-I ziO6GoWL`O&h@N#j^d`5c8=F(Q-*&lnj~zr}`I$)mz0eZiGTJZ)R?t$(>f^XEaKXCKVgs z1QyIgS8&j{Ngiibou2NoMu&-TvMxU_DiWyMmLkJ~o?!|nNJ_lzu$2flbrMxaQ=QT6 zlr@CJj&>iL@XR2#J+31@BESrfO6*mlftWEq?Iy>I>9>WtnpLHiY4-eiSP$xW{24#N ze+_<*wTCHn;6U%guVSs?QGHNbl%jL0IY_)5(B!nP&i}@7wqQSR<;(2Kr$b|wg45^K z(h{2vM!LFmxZkHzLt(h{MU742-m1jD@!jslU$+|YOHN36;TQ4}#hQqBTUW(05S@6Y zXIHeJxb7@ka?Ci+Wa1HGbdQx$pqx9T-?Ai8n{R!v>>Cr~N9N5$+<|2SAmo$tK!HTC z{%LJ7TMEKln=4q7`%Hw>ZWW&CP>zgps<=t8&a!E&AdbZu&N)^St|ny=sG!yKAjf#l zVUp8&ncS`&z0`89X17O{+5)wj(f(@N8g^DWr(m`or`hs&7;#NQ3sr2j>$_5=#9gu8 z9by~OS>{01a=(*gF5ro<-}gI&UxSDI%<1xF=mOydjTY~-HqeE_(M;dL*hm%RU~XgT zcpo^#y%SRG0N`}HQ19tAr}C2fVpTw3Lms!m7IkvOuWWFPh?F_`$rdr`yvY@dA`pFP zvszTQA2 z+=$azPiohXMi@mjLNYYc$?OklT$SJ6QMYcoSG*WnG(01^^1fkPWJxzTOFVJrxe0fT#B-u1Dc1(C}5&sHFiidCkK6Lx%fB*x7`4f`+t)hXgt>w>MpPUVJ z*9XD>_5@+iddrZmMxUq502Lhz*>{z9w;+RtftE4~PDT?Wlr%dzjS_;(qcrCTda4x~ zh7+K%hPK$0^IGy00>SttA^@4E$$+HerP>`$U-T-?eG>6%Mt_Ydc$Uc{5`;DNMA`am%n5T(CTJpo&^%`q0cc|GNosf1?P-a zR}HG*0YO$SW>}z7);Ja=OS+`U7K9rSJrA+k3DnfG3CBQZx(ABxskclgm-)jxo?kFq zrz;nTyK@MQn+*uVa+E2@Aks#4b6`!mbu>Fdg^({Yvyi?z17bp3*8{HM90!ul8^(4s z9`<6AtUKf;Ut79d=Jw?VnuBYL@|RVey2G03HXSufo0N$P^Q-v-Ur$yoZZj2q@93Wf zCUsm+$Ml@;8yq43I)+;BE@d7e8{aCDtOmjp+0tP(UQZ ziV(nGtgx3|HOh&@^Pi-ofGwc?K1&Ep0FY|-QReJ9%ju~^Df@o1poxDKcjSxo0!y2D zelPtaWbLt!?^#NH%Gs>xj*NgI-E%h5k*lWK4FMOAjmwa2X_q2Bqbpr0jT(yzBR7Fo zTaS*2>t=1qTpGFT(UZ%(RSyj*!D`8)Q%I?|u_;a(@AMGW01C~U1IZ^BPthW43#U}} zdmVb=dtA+RJ!(F_tPXWrj)HJq{Qh?+d^(VdMtJ&DI@J~knQvTJks^5BiL z-l3g(_F(2<&0=Wfx$sX^XVKAaw7OqhQ+RFlqDd-KM`h&2cvOk6(7hslAZMdN^<->O z>_{!ESknGOjh^dlRQP$&!f;`<*y}es*+TqB;cZ+`Ed1K=FuZIX-Z02aT z9A|Pxe7>S{w|Io(h!^bB>ySA2iWHibHXy+beOI2fZ-q1d`*qPmz03;9X3voo5boS^ za0){_9;goR7B+5|dz1TRVGIS{!e@vt(8~-l4VE?M{Bn8|h*rj*=>0CbP;!LX&7B}I zKUDTA))S6uvHYqtR39I+>LtK47zr!rkho^1R*{Kd<_tMmNA=Eo8pCk>WFe3G+0H4)DG{4X8G|G~OJFUfLd{=gK zKzXwq0^y;dq|-dMSE6anNf_9sitgQ@!tULK-nXf^$qj_DWoEYK4WB94@oEN}iPTl_ zgG)bBTBCy4o=haW7k`|YlEgV~+N1FfHtTnmJj%n8S(Br{?oASxc<(OR+nc>xwyNN>1ZZ;PVP)u2s-X0S*|(+Oe+;g?8EgHirva~9<^G;{`^ zLdyWy_^Z*C=8Vb|j}ySxn(Z_S;v~o!#MvyL;dBraI35964#JnYG&&{F;e#3rnm-uB zP_la@GtMQecNF8=SB55n$_v-f)q!fHVI2khV#a8>nj|a*hR>-2U<*IITlUoVZTql- z^C5bLsk=>?whMMu+3sdOG-t_Ruv)MX4*E1C9@VD9SIz*4u#XDp>8k7PS5*OrM6Y}c z^j&V?*26L6me9er%Zv*WQ!)Fhza+|t*;6;#-_aJJL5d*(eeH`{%#VYDULr@2gI`l-BcN+gs1+W_}ML6=`>DS{T*GA}uUw zx5h`wXZfu{$=>I+;t?PmX%^mHLBq|H?8<@2yLZx~=9t)z0`FG(==2s&_8#jJr+x-} zZg@u)#Y@jj!E3268Vay1$10<@5XMQP3I$k~WAPKA9-b)syM+ZTjlBrokOB=`b7|qT zk}B@y@4(>OP3m(q_TvSoc%@k^6T)WeNA+H$zfKjBm2g#T!%`z>yII>iQHrF)^nOuIK6oDeF4?|)4Q~mV6=(O?K zp0P8a1)AEVvLy_i=$Vm4@AGC{ec7BPJ)f#YTAzJrn``TA?6BX=Z)>p}KJQ8!DyVQNg!)D&&?dis01n@YcRPC!-TewsbW! z+`)+3=X3?xCt-}vcbNAv<3FeNkf1T+YX@Vi-;bs|xSgBsp#LpG_a~@-(y-i97DtcB zb^@@v_n{~0>n#c{xQ{-ASSfcDjJ)0?%HNIBK91JfZD|%!VVZ0}j!e2(PhRviY9xk` z>jLv4n%+98ycM?Xb#75P@N|6vc`IGiJO%HjX7>r9aqGz7%HMCDKX#6VI_j0@^HH`S zKKdB*u}w8);dDMuiF_U*Ln=S6W*cRj{v*lmbW&vn{;n?!!5)oB_S^wY7q+$q+rvu& zN!el}?2Kz_QK?Q=?{L9>p4qdlSf>(5NIWABPJ#pbF0w&I#U{+?5;_5is-X*Cbz1G2 zl6rI$$wFx|hAxCBCN@5`M~!J$4M_9)(`0SmQM2`QuEo0va=w;!IAShz`OjGXktY2o zI3-+zovxrTPD0N~h@f}q?)N9z-#2_e&~1)sx99+%1@8N`_>FnlN81?3@-~A-O0~bk z(5kGAc4EZWaM}vRh$M^lv1HZH8T)%7rr=HaMo7%9;d%u(F9Vh!q z&VG)FXX8o&YYCv3F{`_Ex*w_kwk|0s&lAz%c>#lGo)uV`?V{W5;p6E5{`#MlUTziiv}l|1hW5 z9g4L8zws1x6i#)!ZB*W-8P7M+yFc|EI}q{9zVm)v744gcsmhjR%S#U(fTf~GO*xB} zbfgSMeXH*JL;Z<%B@DR_)?!(~bJ-v+|5%1qA|~0OXGVU9e*W(3E^T>x;aP{dZ;hBd zU2)%A*%^PG)ecHQ%k5Fen5}Ztl_d|a&wKFvgSJKnZv=IF5VkiznX%kj}x>pYhQCMuqL(|BS z8`RoXYiD@hJavRSH@?}KnA5VH^`47$FOV=FUg}{Mo%1R%Upy^|YG{4BFe-KT$@hAy zXV>Ry>Cm3c8(vus77ph}0_SJh&F@x%8VUv$h8%i5r}#&k{S@$@ozcC3pA|gM$^LRp zzbgIRIo)&oROeZSWh-4p-RNB4KOKPruWhv@fO zn7_EIp~L%6rT?mo`JMguDv!U|iJ;EpFZMrcKK|QBLplCv_a7YrO*}z8(SKw36{R%t zzqzj8JNmniyI1rRrLMoT{hP=8UC!^B!oTG7Kud}KDR20@gx`}Qe@P(4{VCzk6v_Ym z+g+f`AXNFk4#9pMA-^Ak{iQMO?`(e^iv8Z@-*bU~37EtFq4)2w{kKlv*PQ%p_ZBYw zY2kb3KPymv?fLIDDEGWStv3H}ynj`s{NDZF>j3_el8XFi_y6d@kK2!`fd9FaQ0O>> hg8#Sg_#x%TakH`<;(ZhYT_hgE#6bI;LUsT2{{STQ%_;x@ literal 0 HcmV?d00001 diff --git a/sql/datadashboard/table.sql b/sql/datadashboard/table.sql index 45e2958..7ee5602 100644 --- a/sql/datadashboard/table.sql +++ b/sql/datadashboard/table.sql @@ -1033,4 +1033,78 @@ COMMENT ON COLUMN shz_data_dashboard.model_supply_monitor_occupation_population.female_count IS '女性人数'; COMMENT -ON TABLE shz_data_dashboard.model_supply_monitor_occupation_population IS '劳动力供给分职业劳动力人口'; \ No newline at end of file +ON TABLE shz_data_dashboard.model_supply_monitor_occupation_population IS '劳动力供给分职业劳动力人口'; + + +--劳动力供给分职业劳动力人口 +CREATE TABLE shz_data_dashboard.model_supply_monitor_occupation_population +( + id serial PRIMARY KEY, + year integer NOT NULL, + occupation_code character varying(200) NOT NULL COLLATE pg_catalog."default", + occupation_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_occupation_population + OWNER TO sysdba; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_occupation_population.id IS '主键'; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_occupation_population.year IS '年份'; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_occupation_population.occupation_code IS '职业编号'; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_occupation_population.occupation_name IS '职业名称'; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_occupation_population.male_count IS '男性人数'; + +COMMENT +ON COLUMN shz_data_dashboard.model_supply_monitor_occupation_population.female_count IS '女性人数'; + +COMMENT +ON TABLE shz_data_dashboard.model_supply_monitor_occupation_population IS '劳动力供给分职业劳动力人口'; + + +--劳动力需求就业人数 +CREATE TABLE shz_data_dashboard.model_demand_monitor_employment +( + id serial PRIMARY KEY, + year integer NOT NULL, + total_count integer NOT NULL, + first_industry_count integer NOT NULL, + second_industry_count integer NOT NULL, + third_industry_count integer NOT NULL +) +; + +ALTER TABLE shz_data_dashboard.model_demand_monitor_employment + OWNER TO sysdba; + +COMMENT +ON COLUMN shz_data_dashboard.model_demand_monitor_employment.id IS '主键'; + +COMMENT +ON COLUMN shz_data_dashboard.model_demand_monitor_employment.year IS '年份'; + +COMMENT +ON COLUMN shz_data_dashboard.model_demand_monitor_employment.total_count IS '总就业人数(万人)'; + +COMMENT +ON COLUMN shz_data_dashboard.model_demand_monitor_employment.first_industry_count IS '第一产业就业人数(万人)'; + +COMMENT +ON COLUMN shz_data_dashboard.model_demand_monitor_employment.second_industry_count IS '第二产业就业人数(万人)'; + +COMMENT +ON COLUMN shz_data_dashboard.model_demand_monitor_employment.third_industry_count IS '第三产业就业人数(万人)'; + +COMMENT +ON TABLE shz_data_dashboard.model_demand_monitor_employment IS '劳动力需求就业人数'; \ No newline at end of file