diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/MonthlyPlanController.java b/bonus-business/src/main/java/com/bonus/digital/controller/MonthlyPlanController.java index 572df66..0b5d195 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/MonthlyPlanController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/MonthlyPlanController.java @@ -120,7 +120,9 @@ public class MonthlyPlanController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, MonthlyPlanVo monthlyPlanVo) throws IOException { List list = monthlyPlanService.exportMonthlyPlanPerson(monthlyPlanVo); - MonthPlanExcelExporter.exportToExcel(response, list, 2025, 10, "10月运检人员安排"); + int year = LocalDate.now().getYear(); + int month = LocalDate.now().getMonthValue(); + MonthPlanExcelExporter.exportToExcel(response, list, year, month, month+"月运检人员安排"); } @Log(title = "导出工作量汇总表", businessType = BusinessType.EXPORT) diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/MonthlyPlanVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/MonthlyPlanVo.java index 50bd554..a5df258 100644 --- a/bonus-business/src/main/java/com/bonus/digital/dao/MonthlyPlanVo.java +++ b/bonus-business/src/main/java/com/bonus/digital/dao/MonthlyPlanVo.java @@ -87,11 +87,21 @@ public class MonthlyPlanVo { */ private Integer planSkilledWorkerNum; + /** + * 计划投入熟练工工日 + */ + private Integer planSkilledWorkerDay; + /** * 计划投入辅助工人员数量 */ private Integer planAuxiliaryWorkerNum; + /** + * 计划投入辅助工人工日 + */ + private Integer planAuxiliaryWorkerDay; + /** * 计划投入分包车辆数量 */ diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/WorkloadVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/WorkloadVo.java index f3eb168..34c1dd8 100644 --- a/bonus-business/src/main/java/com/bonus/digital/dao/WorkloadVo.java +++ b/bonus-business/src/main/java/com/bonus/digital/dao/WorkloadVo.java @@ -12,17 +12,17 @@ public class WorkloadVo { /** * 工作量id */ - private int workloadId; + private Integer workloadId; /** * 计划填报id */ - private int planId; + private Integer planId; /** * 工作量类别id */ - private int workloadCategoryId; + private Integer workloadCategoryId; /** * 工作量类别名称 @@ -37,7 +37,7 @@ public class WorkloadVo { /** *工作量 */ - private int workloadNum; + private Integer workloadNum; /** * 数据来源:0月计划:1日计划 diff --git a/bonus-business/src/main/java/com/bonus/digital/mapper/WorkloadCategoryMapper.java b/bonus-business/src/main/java/com/bonus/digital/mapper/WorkloadCategoryMapper.java index 9263af0..d9dbb4a 100644 --- a/bonus-business/src/main/java/com/bonus/digital/mapper/WorkloadCategoryMapper.java +++ b/bonus-business/src/main/java/com/bonus/digital/mapper/WorkloadCategoryMapper.java @@ -1,6 +1,7 @@ package com.bonus.digital.mapper; import com.bonus.digital.dao.WorkloadCategoryVo; +import com.bonus.digital.dao.WorkloadVo; import java.util.List; @@ -12,4 +13,6 @@ public interface WorkloadCategoryMapper { int delWorkloadCategory(WorkloadCategoryVo workloadCategoryVo); int updateWorkloadCategory(WorkloadCategoryVo workloadCategoryVo); + + List getWorkloadList(WorkloadVo workloadVo); } diff --git a/bonus-business/src/main/java/com/bonus/digital/service/impl/MonthlyPlanServiceImpl.java b/bonus-business/src/main/java/com/bonus/digital/service/impl/MonthlyPlanServiceImpl.java index 29d845e..b98a7f5 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/impl/MonthlyPlanServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/impl/MonthlyPlanServiceImpl.java @@ -5,6 +5,7 @@ import com.bonus.common.utils.StringUtils; import com.bonus.digital.dao.*; import com.bonus.digital.mapper.MonthlyPlanMapper; import com.bonus.digital.mapper.PersonnelMapper; +import com.bonus.digital.mapper.WorkloadCategoryMapper; import com.bonus.digital.service.MonthlyPlanService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -30,27 +31,38 @@ public class MonthlyPlanServiceImpl implements MonthlyPlanService { @Resource private PersonnelMapper personnelMapper; + @Resource + private WorkloadCategoryMapper workloadCategoryMapper; + /** * 月计划列表 */ @Override public List getPlanMajorList(MonthlyPlanVo monthlyPlanVo) { - List monthlyPlanVoList = monthlyPlanMapper.getPlanMajorList(monthlyPlanVo); - for (MonthlyPlanVo monthlyPlanVo2 : monthlyPlanVoList) { - if (StringUtils.isNotEmpty(monthlyPlanVo2.getPlanPersonnel())){ - //获取每个月计划投入的管理人员 - List plannedIdList = Arrays.asList(monthlyPlanVo2.getPlanPersonnel().split(",")); - PersonnelVo personnelVo = new PersonnelVo(); - personnelVo.setIdList(plannedIdList); - List plannedList = personnelMapper.getPersonnelList(personnelVo); - monthlyPlanVo2.setPersonneltList(plannedList); - //获取人员安排信息 - List personnelArrangementVoList = monthlyPlanMapper.getPersonnelArrangementList(monthlyPlanVo2); - monthlyPlanVo2.setPersonnelArrangementList(personnelArrangementVoList); + try { + List monthlyPlanVoList = monthlyPlanMapper.getPlanMajorList(monthlyPlanVo); + for (MonthlyPlanVo monthlyPlanVo2 : monthlyPlanVoList) { + if (StringUtils.isNotEmpty(monthlyPlanVo2.getPlanPersonnel())){ + //获取每个月计划投入的管理人员 + List plannedIdList = Arrays.asList(monthlyPlanVo2.getPlanPersonnel().split(",")); + PersonnelVo personnelVo = new PersonnelVo(); + personnelVo.setIdList(plannedIdList); + List plannedList = personnelMapper.getPersonnelList(personnelVo); + monthlyPlanVo2.setPersonneltList(plannedList); + //获取人员安排信息 + List personnelArrangementVoList = monthlyPlanMapper.getPersonnelArrangementList(monthlyPlanVo2); + monthlyPlanVo2.setPersonnelArrangementList(personnelArrangementVoList); + } + WorkloadVo workloadVo = new WorkloadVo(); + workloadVo.setPlanId(monthlyPlanVo2.getMonthlyPlanId()); + workloadVo.setDataSource("0"); + List workloadVoList = workloadCategoryMapper.getWorkloadList(workloadVo); + monthlyPlanVo2.setWorkloadList(workloadVoList); } - + return monthlyPlanVoList; + }catch (Exception e){ + throw new RuntimeException(e); } - return monthlyPlanVoList; } /** diff --git a/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml b/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml index 04bf590..3477604 100644 --- a/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml +++ b/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml @@ -66,9 +66,15 @@ plan_skilled_worker_num=#{planSkilledWorkerNum}, + + plan_skilled_worker_day=#{planSkilledWorkerDay}, + plan_auxiliary_worker_num=#{planAuxiliaryWorkerNum}, + + plan_auxiliary_worker_day=#{planAuxiliaryWorkerDay}, + plan_sub_car_num=#{planSubCarNum}, diff --git a/bonus-business/src/main/resources/mapper/WorkloadCategoryMapper.xml b/bonus-business/src/main/resources/mapper/WorkloadCategoryMapper.xml index 26ff46c..d82061c 100644 --- a/bonus-business/src/main/resources/mapper/WorkloadCategoryMapper.xml +++ b/bonus-business/src/main/resources/mapper/WorkloadCategoryMapper.xml @@ -39,4 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and workload_category_name like concat('%',#{workloadCategoryName},'%') +