diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelClassificationController.java b/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelClassificationController.java index 24d7a18..7d3b17e 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelClassificationController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelClassificationController.java @@ -51,8 +51,10 @@ public class PersonnelClassificationController extends BaseController { { try { int res = personnelClassificationService.addClassification(personnelClassificationVo); - if (res > 0) { + if (res == 1) { return AjaxResult.success(); + } else if (res == 2) { + return AjaxResult.error("名称已经存在"); }else { return AjaxResult.error("新增失败"); } @@ -93,9 +95,12 @@ public class PersonnelClassificationController extends BaseController { { try { int res = personnelClassificationService.updateClassification(personnelClassificationVo); - if (res > 0) { + if (res == 1) { return AjaxResult.success(); - }else { + }else if (res == 2) { + return AjaxResult.error("名称已经存在"); + } + else { return AjaxResult.error("修改失败"); } }catch (Exception e) { diff --git a/bonus-business/src/main/java/com/bonus/digital/mapper/PersonnelClassificationMapper.java b/bonus-business/src/main/java/com/bonus/digital/mapper/PersonnelClassificationMapper.java index fd89a0a..40939b9 100644 --- a/bonus-business/src/main/java/com/bonus/digital/mapper/PersonnelClassificationMapper.java +++ b/bonus-business/src/main/java/com/bonus/digital/mapper/PersonnelClassificationMapper.java @@ -25,4 +25,6 @@ public interface PersonnelClassificationMapper { * 修改0:人员分类1:人员性质2:岗位列表 */ int updateClassification(PersonnelClassificationVo personnelClassificationVo); + + PersonnelClassificationVo getClassification(PersonnelClassificationVo personnelClassificationVo); } diff --git a/bonus-business/src/main/java/com/bonus/digital/service/impl/InspectionStationServiceImpl.java b/bonus-business/src/main/java/com/bonus/digital/service/impl/InspectionStationServiceImpl.java index d3aea17..98463ae 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/impl/InspectionStationServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/impl/InspectionStationServiceImpl.java @@ -40,6 +40,7 @@ public class InspectionStationServiceImpl implements InspectionStationService { Long userId = SecurityUtils.getUserId(); inspectionStationVo.setCreateUser(userId.toString()); inspectionStationVo.setCreateTime(new Date()); + //查看是否存在同名的 InspectionStationVo res = inspectionStationMapper.getInspectionStation(inspectionStationVo); if (res != null) { return 2; @@ -63,6 +64,7 @@ public class InspectionStationServiceImpl implements InspectionStationService { Long userId = SecurityUtils.getUserId(); inspectionStationVo.setUpdateUser(userId.toString()); inspectionStationVo.setUpdateTime(new Date()); + //查看是否存在修改过后同名的 InspectionStationVo res = inspectionStationMapper.getInspectionStation(inspectionStationVo); if (res != null && inspectionStationVo.getInspectionStationId()!=res.getInspectionStationId()) { return 2; diff --git a/bonus-business/src/main/java/com/bonus/digital/service/impl/PersonnelClassificationServiceImpl.java b/bonus-business/src/main/java/com/bonus/digital/service/impl/PersonnelClassificationServiceImpl.java index 2d12584..4ff538b 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/impl/PersonnelClassificationServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/impl/PersonnelClassificationServiceImpl.java @@ -46,6 +46,11 @@ public class PersonnelClassificationServiceImpl implements PersonnelClassificati Long userId = SecurityUtils.getUserId(); personnelClassificationVo.setCreateUser(userId.toString()); personnelClassificationVo.setCreateTime(new Date()); + //查看新增是否存在 + PersonnelClassificationVo res = personnelClassificationMapper.getClassification(personnelClassificationVo); + if (res != null) { + return 2; + } return personnelClassificationMapper.addClassification(personnelClassificationVo); } @@ -69,6 +74,11 @@ public class PersonnelClassificationServiceImpl implements PersonnelClassificati Long userId = SecurityUtils.getUserId(); personnelClassificationVo.setUpdateUser(userId.toString()); personnelClassificationVo.setUpdateTime(new Date()); + //查看新增是否存在 + PersonnelClassificationVo res = personnelClassificationMapper.getClassification(personnelClassificationVo); + if (res != null && personnelClassificationVo.getPersonnelClassificationId() != res.getPersonnelClassificationId()) { + return 2; + } return personnelClassificationMapper.updateClassification(personnelClassificationVo); } } diff --git a/bonus-business/src/main/java/com/bonus/digital/service/impl/PlanMajorServiceImpl.java b/bonus-business/src/main/java/com/bonus/digital/service/impl/PlanMajorServiceImpl.java index 50f8e16..a7b96ae 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/impl/PlanMajorServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/impl/PlanMajorServiceImpl.java @@ -43,6 +43,7 @@ public class PlanMajorServiceImpl implements PlanMajorService { Long userId = SecurityUtils.getUserId(); planMajorVo.setCreateUser(userId.toString()); planMajorVo.setCreateTime(new Date()); + return planMajorMapper.addPlanMajor(planMajorVo); } diff --git a/bonus-business/src/main/resources/mapper/DayPlanMapper.xml b/bonus-business/src/main/resources/mapper/DayPlanMapper.xml index 0fd550a..d25acd4 100644 --- a/bonus-business/src/main/resources/mapper/DayPlanMapper.xml +++ b/bonus-business/src/main/resources/mapper/DayPlanMapper.xml @@ -7,6 +7,7 @@ INSERT INTO tb_day_plan + monthly_plan_id, day_plan, planned_workload, proposed_personnel, @@ -35,6 +36,7 @@ risk_level, + #{monthlyPlanId}, #{dayPlan}, #{plannedWorkload}, #{proposedPersonnel}, diff --git a/bonus-business/src/main/resources/mapper/PersonnelClassificationMapper.xml b/bonus-business/src/main/resources/mapper/PersonnelClassificationMapper.xml index 0b17db9..738c74e 100644 --- a/bonus-business/src/main/resources/mapper/PersonnelClassificationMapper.xml +++ b/bonus-business/src/main/resources/mapper/PersonnelClassificationMapper.xml @@ -37,4 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and personnel_classification_name like concat('%',#{personnelClassificationName},'%') +