From 0933d1106b0510a84d684bcc160fc74c4e30084a Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 17 Dec 2025 17:11:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tool/MonthPlanExcelExporter.java | 112 ++++++++++++++++++ .../digital/controller/DayPlanController.java | 112 ++++++++++++++++++ .../controller/MonthlyPlanController.java | 72 +++++++---- .../controller/PlanManagementController.java | 62 +++++----- .../digital/dao/ExportMonthPlanPersonVo.java | 31 +++++ .../digital/mapper/MonthlyPlanMapper.java | 4 + .../digital/service/MonthlyPlanService.java | 3 + .../service/impl/MonthlyPlanServiceImpl.java | 37 ++++-- .../main/resources/mapper/MonthPlanMapper.xml | 12 ++ .../main/resources/mapper/PersonnalMapper.xml | 4 +- .../framework/config/SecurityConfig.java | 6 +- 11 files changed, 391 insertions(+), 64 deletions(-) create mode 100644 bonus-business/src/main/java/com/bonus/business/controller/tool/MonthPlanExcelExporter.java create mode 100644 bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java create mode 100644 bonus-business/src/main/java/com/bonus/digital/dao/ExportMonthPlanPersonVo.java diff --git a/bonus-business/src/main/java/com/bonus/business/controller/tool/MonthPlanExcelExporter.java b/bonus-business/src/main/java/com/bonus/business/controller/tool/MonthPlanExcelExporter.java new file mode 100644 index 0000000..aa3b5bc --- /dev/null +++ b/bonus-business/src/main/java/com/bonus/business/controller/tool/MonthPlanExcelExporter.java @@ -0,0 +1,112 @@ +package com.bonus.business.controller.tool; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import com.bonus.digital.dao.ExportMonthPlanPersonVo; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.*; + +public class MonthPlanExcelExporter { + + private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + /** + * 将原始数据转换为按日期展开的 Map 列表（用于 EasyExcel 导出） + * + * @param dataList 原始数据列表 + * @param year 年份，如 2025 + * @param month 月份，如 10 + * @return List> 用于 EasyExcel writeMap + */ + public static List> convertToDailyMapList( + List dataList, int year, int month) { + + // 获取该月最大天数 + int daysInMonth = LocalDate.of(year, month, 1).lengthOfMonth(); + + // 构建表头顺序（固定列 + 动态日期列） + List headers = Arrays.asList( + "运检站", "姓名", "性别", "岗位", "人员性质", "分类" + ); + List dateHeaders = new ArrayList<>(); + for (int d = 1; d <= daysInMonth; d++) { + dateHeaders.add(d + "日"); + } + + // 按 (运检站 + 姓名) 分组 + Map> rowMap = new LinkedHashMap<>(); + + for (ExportMonthPlanPersonVo item : dataList) { + String key = item.getInspectionStationName() + "_" + item.getName(); + + // 初始化行数据 + rowMap.computeIfAbsent(key, k -> { + Map row = new LinkedHashMap<>(); + row.put("运检站", item.getInspectionStationName()); + row.put("姓名", item.getName()); + row.put("性别", item.getSex()); + row.put("岗位", item.getPositionName()); + row.put("人员性质", item.getPersonnelNatureName()); + row.put("分类", item.getPersonnelClassificationName()); + + // 初始化所有日期列为 "" + for (String dh : dateHeaders) { + row.put(dh, ""); + } + return row; + }); + + // 解析日期范围 + LocalDate start = LocalDate.parse(item.getPlannedStartTime(), DATE_FORMATTER); + LocalDate end = LocalDate.parse(item.getPlannedEndTime(), DATE_FORMATTER); + + // 遍历每一天 + for (LocalDate date = start; !date.isAfter(end); date = date.plusDays(1)) { + if (date.getYear() == year && date.getMonthValue() == month) { + int day = date.getDayOfMonth(); + String dateKey = day + "日"; + String currentContent = (String) rowMap.get(key).get(dateKey); + String newContent = item.getWorkContent(); + + // 如果当天已有内容，用换行拼接 + if (currentContent == null || currentContent.trim().isEmpty()) { + rowMap.get(key).put(dateKey, newContent); + } else { + rowMap.get(key).put(dateKey, currentContent + "\n" + newContent); + } + } + } + } + + return new ArrayList<>(rowMap.values()); + } + + /** + * 导出 Excel 到 HttpServletResponse（Web 场景） + */ + public static void exportToExcel(HttpServletResponse response, + List dataList, + int year, int month, + String sheetName) throws IOException { + + List> mapList = convertToDailyMapList(dataList, year, month); + + // 设置响应头 + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + String fileName = URLEncoder.encode(sheetName, "UTF-8"); + response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); + + // 使用 EasyExcel 导出 + EasyExcel.write(response.getOutputStream()) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .autoCloseStream(true) + .sheet(sheetName) + .doWrite(mapList); + } +} diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java b/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java new file mode 100644 index 0000000..66a71f9 --- /dev/null +++ b/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java @@ -0,0 +1,112 @@ +package com.bonus.digital.controller; + +import com.bonus.business.controller.tool.MonthPlanExcelExporter; +import com.bonus.common.annotation.Log; +import com.bonus.common.core.controller.BaseController; +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.page.TableDataInfo; +import com.bonus.common.enums.BusinessType; +import com.bonus.digital.dao.ExportMonthPlanPersonVo; +import com.bonus.digital.dao.MonthlyPlanVo; +import com.bonus.digital.service.MonthlyPlanService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/12/16 + */ +@Slf4j +@RestController +@RequestMapping("/monthlyPlan") +public class DayPlanController extends BaseController { + + @Resource + private MonthlyPlanService monthlyPlanService; + + /** + * 月计划列表 + */ + @PreAuthorize("@ss.hasPermi('monthly:plan:list')") + @GetMapping("/getMonthlyPlanList") + public TableDataInfo getMonthlyPlanList(MonthlyPlanVo monthlyPlanVo) { + try { + startPage(); + List list = monthlyPlanService.getPlanMajorList(monthlyPlanVo); + return getDataTable(list); + } catch (Exception e) { + return getDataTable(null); + } + } + + /** + * 新增月计划 + */ + @PreAuthorize("@ss.hasPermi('monthly:plan:add')") + @PostMapping("/addMonthlyPlan") + public AjaxResult addMonthlyPlan(MonthlyPlanVo monthlyPlanVo) { + try { + int res = monthlyPlanService.addMonthlyPlanList(monthlyPlanVo); + if (res > 0) { + return AjaxResult.success(); + } else { + return AjaxResult.error("新增失败"); + } + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); + } + } + + /** + * 删除月计划 + */ + @PreAuthorize("@ss.hasPermi('monthly:plan:del')") + @PostMapping("/delMonthlyPlan") + public AjaxResult delMonthlyPlan(MonthlyPlanVo monthlyPlanVo) { + try { + int res = monthlyPlanService.delMonthlyPlanList(monthlyPlanVo); + if (res > 0) { + return AjaxResult.success(); + } else { + return AjaxResult.error("删除失败"); + } + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); + } + } + + /** + * 修改月计划 + */ + @PreAuthorize("@ss.hasPermi('monthly:plan:update')") + @PostMapping("/updateMonthlyPlan") + public AjaxResult updateMonthlyPlan(MonthlyPlanVo monthlyPlanVo) { + try { + int res = monthlyPlanService.updateMonthlyPlan(monthlyPlanVo); + if (res > 0) { + return AjaxResult.success(); + } else { + return AjaxResult.error("修改失败"); + } + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); + } + } + + @Log(title = "导出人员安排表", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('monthly:plan:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, MonthlyPlanVo monthlyPlanVo) throws IOException { + List list = monthlyPlanService.exportMonthlyPlanPerson(monthlyPlanVo); + MonthPlanExcelExporter.exportToExcel(response, list, 2025, 10, "10月运检人员安排"); + } +} 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 662b2a8..d73c26e 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 @@ -1,9 +1,13 @@ package com.bonus.digital.controller; +import com.bonus.business.controller.tool.MonthPlanExcelExporter; +import com.bonus.common.annotation.Log; import com.bonus.common.core.controller.BaseController; import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.page.TableDataInfo; +import com.bonus.common.enums.BusinessType; import com.bonus.digital.dao.MonthlyPlanVo; +import com.bonus.digital.dao.ExportMonthPlanPersonVo; import com.bonus.digital.service.MonthlyPlanService; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -13,7 +17,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.time.format.DateTimeFormatter; +import java.util.*; /** * @author 马三炮 @@ -28,18 +35,30 @@ public class MonthlyPlanController extends BaseController { private MonthlyPlanService monthlyPlanService; /** - * 月计划列表 + * 月计划列表(带分页) */ @PreAuthorize("@ss.hasPermi('monthly:plan:list')") @GetMapping("/getMonthlyPlanList") - public TableDataInfo getMonthlyPlanList(MonthlyPlanVo monthlyPlanVo) - { + public TableDataInfo getMonthlyPlanList(MonthlyPlanVo monthlyPlanVo) { try { startPage(); List list = monthlyPlanService.getPlanMajorList(monthlyPlanVo); return getDataTable(list); - }catch (Exception e) { - return getDataTable(null); + } catch (Exception e) { + return getDataTable(null); + } + } + + /** + * 月计划列表(不带分页) + */ + @GetMapping("/getMonthlyPlanLists") + public AjaxResult getMonthlyPlanLists(MonthlyPlanVo monthlyPlanVo) { + try { + List list = monthlyPlanService.getPlanMajorList(monthlyPlanVo); + return AjaxResult.success(list); + } catch (Exception e) { + return AjaxResult.error("请求错误"); } } @@ -48,17 +67,16 @@ public class MonthlyPlanController extends BaseController { */ @PreAuthorize("@ss.hasPermi('monthly:plan:add')") @PostMapping("/addMonthlyPlan") - public AjaxResult addMonthlyPlan(MonthlyPlanVo monthlyPlanVo) - { + public AjaxResult addMonthlyPlan(MonthlyPlanVo monthlyPlanVo) { try { - int res = monthlyPlanService.addMonthlyPlanList(monthlyPlanVo); + int res = monthlyPlanService.addMonthlyPlanList(monthlyPlanVo); if (res > 0) { return AjaxResult.success(); - }else { + } else { return AjaxResult.error("新增失败"); } - }catch (Exception e) { - return AjaxResult.error("系统异常，请联系管理员"); + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); } } @@ -67,17 +85,16 @@ public class MonthlyPlanController extends BaseController { */ @PreAuthorize("@ss.hasPermi('monthly:plan:del')") @PostMapping("/delMonthlyPlan") - public AjaxResult delMonthlyPlan(MonthlyPlanVo monthlyPlanVo) - { + public AjaxResult delMonthlyPlan(MonthlyPlanVo monthlyPlanVo) { try { - int res = monthlyPlanService.delMonthlyPlanList(monthlyPlanVo); + int res = monthlyPlanService.delMonthlyPlanList(monthlyPlanVo); if (res > 0) { return AjaxResult.success(); - }else { + } else { return AjaxResult.error("删除失败"); } - }catch (Exception e) { - return AjaxResult.error("系统异常，请联系管理员"); + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); } } @@ -86,17 +103,24 @@ public class MonthlyPlanController extends BaseController { */ @PreAuthorize("@ss.hasPermi('monthly:plan:update')") @PostMapping("/updateMonthlyPlan") - public AjaxResult updateMonthlyPlan(MonthlyPlanVo monthlyPlanVo) - { + public AjaxResult updateMonthlyPlan(MonthlyPlanVo monthlyPlanVo) { try { - int res = monthlyPlanService.updateMonthlyPlan(monthlyPlanVo); + int res = monthlyPlanService.updateMonthlyPlan(monthlyPlanVo); if (res > 0) { return AjaxResult.success(); - }else { + } else { return AjaxResult.error("修改失败"); } - }catch (Exception e) { - return AjaxResult.error("系统异常，请联系管理员"); + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); } } + + @Log(title = "导出人员安排表", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('monthly:plan:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, MonthlyPlanVo monthlyPlanVo) throws IOException { + List list = monthlyPlanService.exportMonthlyPlanPerson(monthlyPlanVo); + MonthPlanExcelExporter.exportToExcel(response, list, 2025, 10, "10月运检人员安排"); + } } diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/PlanManagementController.java b/bonus-business/src/main/java/com/bonus/digital/controller/PlanManagementController.java index e43e106..9e25606 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/PlanManagementController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/PlanManagementController.java @@ -29,18 +29,30 @@ public class PlanManagementController extends BaseController { private PlanManagementService planManagementService; /** - * 计划管理表列表 + * 计划管理表列表(带分页) */ @PreAuthorize("@ss.hasPermi('plan:management:list')") @GetMapping("/getPlanManagementList") - public TableDataInfo getPlanManagementList(PlanManagementVo planManagementVo) - { + public TableDataInfo getPlanManagementList(PlanManagementVo planManagementVo) { try { startPage(); List list = planManagementService.getPlanManagementList(planManagementVo); return getDataTable(list); - }catch (Exception e) { - return getDataTable(null); + } catch (Exception e) { + return getDataTable(null); + } + } + + /** + * 计划管理表列表(不带分页) + */ + @GetMapping("/getPlanManagementLists") + public AjaxResult getPlanManagementLists(PlanManagementVo planManagementVo) { + try { + List list = planManagementService.getPlanManagementList(planManagementVo); + return AjaxResult.success(list); + } catch (Exception e) { + return AjaxResult.error("请求错误"); } } @@ -49,17 +61,16 @@ public class PlanManagementController extends BaseController { */ @PreAuthorize("@ss.hasPermi('plan:management:add')") @PostMapping("/addPlanManagement") - public AjaxResult addPlanManagement(@RequestBody PlanManagementVo planManagementVo) - { + public AjaxResult addPlanManagement(@RequestBody PlanManagementVo planManagementVo) { try { - int res = planManagementService.addPlanManagement(planManagementVo); + int res = planManagementService.addPlanManagement(planManagementVo); if (res > 0) { return AjaxResult.success(); - }else { + } else { return AjaxResult.error("新增失败"); } - }catch (Exception e) { - return AjaxResult.error("系统异常，请联系管理员"); + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); } } @@ -68,17 +79,16 @@ public class PlanManagementController extends BaseController { */ @PreAuthorize("@ss.hasPermi('plan:management:del')") @PostMapping("/delPlanManagement") - public AjaxResult delPlanManagement(@RequestBody PlanManagementVo planManagementVo) - { + public AjaxResult delPlanManagement(@RequestBody PlanManagementVo planManagementVo) { try { - int res = planManagementService.delPlanManagement(planManagementVo); + int res = planManagementService.delPlanManagement(planManagementVo); if (res > 0) { return AjaxResult.success(); - }else { + } else { return AjaxResult.error("删除失败"); } - }catch (Exception e) { - return AjaxResult.error("系统异常，请联系管理员"); + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); } } @@ -87,17 +97,16 @@ public class PlanManagementController extends BaseController { */ @PreAuthorize("@ss.hasPermi('plan:management:update')") @PostMapping("/updatePlanManagement") - public AjaxResult updatePlanManagement(@RequestBody PlanManagementVo planManagementVo) - { + public AjaxResult updatePlanManagement(@RequestBody PlanManagementVo planManagementVo) { try { - int res = planManagementService.updatePlanManagement(planManagementVo); + int res = planManagementService.updatePlanManagement(planManagementVo); if (res > 0) { return AjaxResult.success(); - }else { + } else { return AjaxResult.error("修改失败"); } - }catch (Exception e) { - return AjaxResult.error("系统异常，请联系管理员"); + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); } } @@ -106,15 +115,14 @@ public class PlanManagementController extends BaseController { */ @PreAuthorize("@ss.hasPermi('plan:management:import')") @PostMapping("/importPlanManagement") - public AjaxResult importPlanManagement(MultipartFile file) - { + public AjaxResult importPlanManagement(MultipartFile file) { try { ExcelUtil util = new ExcelUtil(PlanManagementVo.class); List planManagementList = util.importExcel(file.getInputStream()); String message = planManagementService.importPlanManagement(planManagementList); return success(message); - }catch (Exception e) { - return AjaxResult.error("系统异常，请联系管理员"); + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); } } diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/ExportMonthPlanPersonVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/ExportMonthPlanPersonVo.java new file mode 100644 index 0000000..cafebdd --- /dev/null +++ b/bonus-business/src/main/java/com/bonus/digital/dao/ExportMonthPlanPersonVo.java @@ -0,0 +1,31 @@ +package com.bonus.digital.dao; + +import com.bonus.common.annotation.Excel; +import lombok.Data; + +/** + * @Author：liang.chao + * @Date：2025/12/17 - 15:32 + */ +@Data +public class ExportMonthPlanPersonVo { + @Excel(name = "运检站") + private String inspectionStationName; + @Excel(name = "作业内容") + private String workContent; + @Excel(name = "计划开始时间") + private String plannedStartTime; + @Excel(name = "计划结束时间") + private String plannedEndTime; + private String planPersonnel; + @Excel(name = "姓名") + private String name; + @Excel(name = "性别") + private String sex; + @Excel(name = "岗位") + private String positionName; + @Excel(name = "人员性质") + private String personnelNatureName; + @Excel(name = "分类") + private String personnelClassificationName; +} diff --git a/bonus-business/src/main/java/com/bonus/digital/mapper/MonthlyPlanMapper.java b/bonus-business/src/main/java/com/bonus/digital/mapper/MonthlyPlanMapper.java index bf6a4ff..976372a 100644 --- a/bonus-business/src/main/java/com/bonus/digital/mapper/MonthlyPlanMapper.java +++ b/bonus-business/src/main/java/com/bonus/digital/mapper/MonthlyPlanMapper.java @@ -51,4 +51,8 @@ public interface MonthlyPlanMapper { * 修改月计划 */ int updateMonthlyPlan(MonthlyPlanVo monthlyPlanVo); + + List getMonthlyPlanPerson(MonthlyPlanVo monthlyPlanVo); + + List getPlanMajorListByMonth(MonthlyPlanVo monthlyPlanVo); } diff --git a/bonus-business/src/main/java/com/bonus/digital/service/MonthlyPlanService.java b/bonus-business/src/main/java/com/bonus/digital/service/MonthlyPlanService.java index 26fc88b..22c08ae 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/MonthlyPlanService.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/MonthlyPlanService.java @@ -1,6 +1,7 @@ package com.bonus.digital.service; import com.bonus.digital.dao.MonthlyPlanVo; +import com.bonus.digital.dao.ExportMonthPlanPersonVo; import java.util.List; @@ -24,4 +25,6 @@ public interface MonthlyPlanService { * 修改月计划 */ int updateMonthlyPlan(MonthlyPlanVo monthlyPlanVo); + + List exportMonthlyPlanPerson(MonthlyPlanVo monthlyPlanVo); } 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 d515b90..39c218c 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 @@ -1,10 +1,7 @@ package com.bonus.digital.service.impl; import com.bonus.common.utils.SecurityUtils; -import com.bonus.digital.dao.MonthlyPlanVo; -import com.bonus.digital.dao.PersonnelArrangementVo; -import com.bonus.digital.dao.PersonnelVo; -import com.bonus.digital.dao.WorkloadVo; +import com.bonus.digital.dao.*; import com.bonus.digital.mapper.MonthlyPlanMapper; import com.bonus.digital.mapper.PersonnelMapper; import com.bonus.digital.service.MonthlyPlanService; @@ -13,10 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @author 马三炮 @@ -117,4 +111,31 @@ public class MonthlyPlanServiceImpl implements MonthlyPlanService { } return res; } + + @Override + public List exportMonthlyPlanPerson(MonthlyPlanVo monthlyPlanVo) { + List monthlyPlanVoList = monthlyPlanMapper.getPlanMajorListByMonth(monthlyPlanVo); + List plannedList= new ArrayList<>(); + for (MonthlyPlanVo monthlyPlanVo2 : monthlyPlanVoList) { + //获取每个月计划投入的管理人员 + List plannedIdList = Arrays.asList(monthlyPlanVo2.getPlanPersonnel().split(",")); + PersonnelVo personnelVo = new PersonnelVo(); + personnelVo.setIdList(plannedIdList); + List personnelList = personnelMapper.getPersonnelList(personnelVo); + for (PersonnelVo vo : personnelList) { + ExportMonthPlanPersonVo exportMonthPlanPersonVo = new ExportMonthPlanPersonVo(); + exportMonthPlanPersonVo.setInspectionStationName(monthlyPlanVo2.getInspectionStationName()); + exportMonthPlanPersonVo.setWorkContent(monthlyPlanVo2.getWorkContent()); + exportMonthPlanPersonVo.setPlannedStartTime(monthlyPlanVo2.getPlannedStartTime()); + exportMonthPlanPersonVo.setPlannedEndTime(monthlyPlanVo2.getPlannedEndTime()); + exportMonthPlanPersonVo.setName(vo.getName()); + exportMonthPlanPersonVo.setSex(vo.getSex()); + exportMonthPlanPersonVo.setPositionName(vo.getPositionName()); + exportMonthPlanPersonVo.setPersonnelNatureName(vo.getPersonnelNatureName()); + exportMonthPlanPersonVo.setPersonnelClassificationName(vo.getPersonnelClassificationName()); + plannedList.add(exportMonthPlanPersonVo); + } + } + return plannedList; + } } diff --git a/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml b/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml index 39378de..b66c4ae 100644 --- a/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml +++ b/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml @@ -126,4 +126,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select personnel_arrangement_id,monthly_plan_id,"day",personnel_names from tb_personnel_arrangement where monthly_plan_id = #{monthlyPlanId} + + diff --git a/bonus-business/src/main/resources/mapper/PersonnalMapper.xml b/bonus-business/src/main/resources/mapper/PersonnalMapper.xml index 937c283..db7083a 100644 --- a/bonus-business/src/main/resources/mapper/PersonnalMapper.xml +++ b/bonus-business/src/main/resources/mapper/PersonnalMapper.xml @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"