From 2490e40c6c5c7b24c9aca93eac17c3400e779a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Wed, 24 Dec 2025 16:05:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MonthlyPlanController.java | 2 +- .../controller/PersonnelController.java | 15 ++++++ .../java/com/bonus/digital/dao/DayPlanVo.java | 6 +++ .../com/bonus/digital/dao/MonthlyPlanVo.java | 30 +++++++----- .../bonus/digital/dao/PlanManagementVo.java | 9 +++- .../digital/service/MonthlyPlanService.java | 2 +- .../service/impl/MonthlyPlanServiceImpl.java | 49 ++++++++----------- .../main/resources/mapper/DayPlanMapper.xml | 4 ++ .../main/resources/mapper/MonthPlanMapper.xml | 8 ++- .../main/resources/mapper/PersonnalMapper.xml | 6 ++- .../resources/mapper/PlanManagementMapper.xml | 21 +++++++- 11 files changed, 103 insertions(+), 49 deletions(-) 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 d21ad4f..572df66 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 @@ -66,7 +66,7 @@ public class MonthlyPlanController extends BaseController { */ @PreAuthorize("@ss.hasPermi('monthly:plan:add')") @PostMapping("/addMonthlyPlan") - public AjaxResult addMonthlyPlan(@RequestBody MonthlyPlanVo monthlyPlanVo) { + public AjaxResult addMonthlyPlan(@RequestBody List monthlyPlanVo) { try { int res = monthlyPlanService.addMonthlyPlanList(monthlyPlanVo); if (res > 0) { diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelController.java b/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelController.java index 434525c..9f24324 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelController.java @@ -42,6 +42,21 @@ public class PersonnelController extends BaseController { } } + /** + * 获取人员管理列表(不分页) + */ + @PreAuthorize("@ss.hasPermi('tb:personnel:list')") + @GetMapping("/getPersonnelListSelect") + public TableDataInfo getPersonnelListSelect(PersonnelVo personnelVo) { + try { + + List list = personnelService.getPersonnelList(personnelVo); + return getDataTable(list); + } catch (Exception e) { + return getDataTable(null); + } + } + //人员所属下拉 //0：运检站1：项目部 @GetMapping("/getInspectionStationSelect") diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java index 38f23e6..ab401d0 100644 --- a/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java +++ b/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java @@ -191,4 +191,10 @@ public class DayPlanVo { // 实际投入地面作业人员（data_source=5） private String actualGroundPersonnelNames; private Integer actualGroundPersonnelNum; + + + /** + * 风险等级 + */ + private String riskLevel; } 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 282d1a5..50bd554 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 @@ -15,7 +15,7 @@ public class MonthlyPlanVo { /** * 月计划填报id */ - private int monthlyPlanId; + private Integer monthlyPlanId; /** * 计划月份 @@ -25,7 +25,7 @@ public class MonthlyPlanVo { /** * 运检站id */ - private int inspectionStationId; + private Integer inspectionStationId; /** * 运检站名称 @@ -35,17 +35,17 @@ public class MonthlyPlanVo { /** * 计划专业id */ - private int planMajorId; + private Integer planMajorId; /** * 业务类型id */ - private int businessTypeId; + private Integer businessTypeId; /** * 项目名称 */ - private int projectName; + private String projectName; /** * 作业内容 @@ -55,12 +55,12 @@ public class MonthlyPlanVo { /** * 计划类别id */ - private int planCategoryId; + private Integer planCategoryId; /** * 塔基数 */ - private int towerBaseNumber; + private Integer towerBaseNumber; /** * 计划开始时间 @@ -80,27 +80,27 @@ public class MonthlyPlanVo { /** * 计划投入管理车辆数量 */ - private int planCarNum; + private Integer planCarNum; /** * 计划投入熟练工人员数量 */ - private int planSkilledWorkerNum; + private Integer planSkilledWorkerNum; /** * 计划投入辅助工人员数量 */ - private int planAuxiliaryWorkerNum; + private Integer planAuxiliaryWorkerNum; /** * 计划投入分包车辆数量 */ - private int planSubCarNum; + private Integer planSubCarNum; /** * 实际工作天数 */ - private int actualWorkingDay; + private Integer actualWorkingDay; /** * 创建人 @@ -162,4 +162,10 @@ public class MonthlyPlanVo { private Integer totalSubCarDays; + + /** + * 风险等级 + */ + private String riskLevel; + } diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/PlanManagementVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/PlanManagementVo.java index 13d31c8..8c08c58 100644 --- a/bonus-business/src/main/java/com/bonus/digital/dao/PlanManagementVo.java +++ b/bonus-business/src/main/java/com/bonus/digital/dao/PlanManagementVo.java @@ -14,7 +14,7 @@ public class PlanManagementVo { /** * 计划管理id */ - private int planManagementId; + private Integer planManagementId; /** * 计划管理月份 @@ -34,7 +34,7 @@ public class PlanManagementVo { /** * 实施部门 */ - private int inspectionStationId; + private Integer inspectionStationId; /** * 实施部门 @@ -86,4 +86,9 @@ public class PlanManagementVo { */ private Date updateTime; + /** + * 关键字 + */ + private String keyWord; + } 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 78f66e8..4c00f49 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 @@ -13,7 +13,7 @@ public interface MonthlyPlanService { /** * 新增月计划 */ - int addMonthlyPlanList(MonthlyPlanVo monthlyPlanVo); + int addMonthlyPlanList(List 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 965809c..29d845e 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,6 +1,7 @@ package com.bonus.digital.service.impl; import com.bonus.common.utils.SecurityUtils; +import com.bonus.common.utils.StringUtils; import com.bonus.digital.dao.*; import com.bonus.digital.mapper.MonthlyPlanMapper; import com.bonus.digital.mapper.PersonnelMapper; @@ -36,17 +37,20 @@ public class MonthlyPlanServiceImpl implements MonthlyPlanService { public List getPlanMajorList(MonthlyPlanVo monthlyPlanVo) { List monthlyPlanVoList = monthlyPlanMapper.getPlanMajorList(monthlyPlanVo); for (MonthlyPlanVo monthlyPlanVo2 : monthlyPlanVoList) { - //获取每个月计划投入的管理人员 - 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); + 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); + } + } - return Collections.emptyList(); + return monthlyPlanVoList; } /** @@ -54,25 +58,14 @@ public class MonthlyPlanServiceImpl implements MonthlyPlanService { */ @Override @Transactional - public int addMonthlyPlanList(MonthlyPlanVo monthlyPlanVo) { - Long userId = SecurityUtils.getUserId(); - monthlyPlanVo.setCreateUser(userId.toString()); - monthlyPlanVo.setCreateTime(new Date()); - int res = monthlyPlanMapper.addMonthlyPlanList(monthlyPlanVo); - //保存人员安排信息 - List personnelArrangementList = monthlyPlanVo.getPersonnelArrangementList(); - for (PersonnelArrangementVo p : personnelArrangementList) { - p.setMonthlyPlanId(monthlyPlanVo.getMonthlyPlanId()); - monthlyPlanMapper.addPersonnelArrangement(p); + public int addMonthlyPlanList(List monthlyPlanVo) { + for (MonthlyPlanVo monthlyPlanVo2 : monthlyPlanVo) { + Long userId = SecurityUtils.getUserId(); + monthlyPlanVo2.setCreateUser(userId.toString()); + monthlyPlanVo2.setCreateTime(new Date()); + monthlyPlanMapper.addMonthlyPlanList(monthlyPlanVo2); } - //保存工作量信息 - List workloadVoList = monthlyPlanVo.getWorkloadList(); - for (WorkloadVo w : workloadVoList) { - w.setPlanId(monthlyPlanVo.getMonthlyPlanId()); - w.setDataSource("0"); - monthlyPlanMapper.addWorkload(w); - } - return res; + return 1; } /** diff --git a/bonus-business/src/main/resources/mapper/DayPlanMapper.xml b/bonus-business/src/main/resources/mapper/DayPlanMapper.xml index 2704ca0..0e89670 100644 --- a/bonus-business/src/main/resources/mapper/DayPlanMapper.xml +++ b/bonus-business/src/main/resources/mapper/DayPlanMapper.xml @@ -32,6 +32,7 @@ create_time, status, day_plan_type, + risk_level, #{dayPlan}, @@ -59,6 +60,7 @@ #{createTime}, #{status}, #{dayPlanType}, + #{riskLevel}, @@ -89,6 +91,7 @@ update_time = #{updateTime}, update_user = #{updateUser}, status = #{status}, + risk_level = #{riskLevel}, WHERE day_plan_id = #{dayPlanId} @@ -143,6 +146,7 @@ tdp.day_plan_type AS dayPlanType, tdp.start_time AS startTime, tdp.end_time AS endTime, + tdp.risk_level AS reskLevel, -- 新增：拟投入高处作业人员（data_source=2）：姓名 + 数量 (SELECT IFNULL(GROUP_CONCAT(tpp.personnel_name SEPARATOR ','), '') diff --git a/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml b/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml index 5bf3f89..04bf590 100644 --- a/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml +++ b/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml @@ -7,11 +7,11 @@ insert into tb_monthly_plan (monthly_plan,inspection_station_id,inspection_station_name,plan_major_id,business_type_id, project_name,work_content,plan_category_id,tower_base_number,planned_start_time, planned_end_time,plan_personnel,plan_car_num,plan_skilled_worker_num,plan_auxiliary_worker_num, - plan_sub_car_num,create_user,create_time,actual_working_day) + plan_sub_car_num,create_user,create_time,actual_working_day,risk_level) values (#{monthlyPlan},#{inspectionStationId},#{inspectionStationName},#{planMajorId},#{businessTypeId}, #{projectName},#{workContent},#{planCategoryId},#{towerBaseNumber},#{plannedStartTime},#{plannedEndTime}, #{planPersonnel},#{planCarNum},#{planSkilledWorkerNum},#{planAuxiliaryWorkerNum},#{planSubCarNum}, - #{createUser},#{createTime},#{actualWorkingDay}) + #{createUser},#{createTime},#{actualWorkingDay},#{riskLevel}) insert into tb_personnel_arrangement (monthly_plan_id,day,personnel_names) @@ -81,6 +81,9 @@ actual_working_day=#{actualWorkingDay}, + + risk_level=#{riskLevel}, + where monthly_plan_id = #{monthlyPlanId} @@ -114,6 +117,7 @@ tmp.plan_sub_car_num, tmp.create_user, tmp.create_time, + tmp.risk_level, tmp.actual_working_day from tb_monthly_plan tmp left join tb_plan_major tpm on tmp.plan_major_id = tpm.plan_major_id diff --git a/bonus-business/src/main/resources/mapper/PersonnalMapper.xml b/bonus-business/src/main/resources/mapper/PersonnalMapper.xml index 70be471..45f4318 100644 --- a/bonus-business/src/main/resources/mapper/PersonnalMapper.xml +++ b/bonus-business/src/main/resources/mapper/PersonnalMapper.xml @@ -98,7 +98,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"