From 4c46e9f1db43ebc4daf36e2fc85fb08cf8ea12fd Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 17 Dec 2025 17:55:28 +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 --- .../digital/controller/DayPlanController.java | 2 +- .../InspectionStationController.java | 5 ++- .../controller/MonthlyPlanController.java | 11 ++--- .../PersonnelClassificationController.java | 5 ++- .../controller/PlanMajorController.java | 5 ++- .../WorkloadCategoryController.java | 40 +++++++++---------- .../digital/dao/InspectionStationVo.java | 5 +++ .../dao/PersonnelClassificationVo.java | 5 +++ .../com/bonus/digital/dao/PlanMajorVo.java | 5 +++ .../mapper/InspectionStationMapper.xml | 3 ++ .../mapper/PersonnelClassificationMapper.xml | 3 ++ .../main/resources/mapper/PlanMajorMapper.xml | 3 ++ .../mapper/WorkloadCategoryMapper.xml | 3 ++ 13 files changed, 59 insertions(+), 36 deletions(-) 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 index 66a71f9..cef25fb 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/DayPlanController.java @@ -27,7 +27,7 @@ import java.util.List; */ @Slf4j @RestController -@RequestMapping("/monthlyPlan") +@RequestMapping("/dayPlan") public class DayPlanController extends BaseController { @Resource diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java b/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java index 74ed26f..1ef4da2 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/InspectionStationController.java @@ -7,6 +7,7 @@ import com.bonus.digital.dao.InspectionStationVo; import com.bonus.digital.service.InspectionStationService; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -46,7 +47,7 @@ public class InspectionStationController extends BaseController { */ @PreAuthorize("@ss.hasPermi('inspection:station:add')") @PostMapping("/addInspectionStation") - public AjaxResult addInspectionStation(@RequestBody InspectionStationVo inspectionStationVo) + public AjaxResult addInspectionStation(@RequestBody @Validated InspectionStationVo inspectionStationVo) { try { int res = inspectionStationService.addInspectionStation(inspectionStationVo); @@ -84,7 +85,7 @@ public class InspectionStationController extends BaseController { */ @PreAuthorize("@ss.hasPermi('inspection:station:update')") @PostMapping("/updateInspectionStation") - public AjaxResult updateInspectionStation(@RequestBody InspectionStationVo inspectionStationVo) + public AjaxResult updateInspectionStation(@RequestBody @Validated InspectionStationVo inspectionStationVo) { try { int res = inspectionStationService.updateInspectionStation(inspectionStationVo); 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 d73c26e..338afd2 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 @@ -11,10 +11,7 @@ import com.bonus.digital.dao.ExportMonthPlanPersonVo; 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 org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -67,7 +64,7 @@ public class MonthlyPlanController extends BaseController { */ @PreAuthorize("@ss.hasPermi('monthly:plan:add')") @PostMapping("/addMonthlyPlan") - public AjaxResult addMonthlyPlan(MonthlyPlanVo monthlyPlanVo) { + public AjaxResult addMonthlyPlan(@RequestBody MonthlyPlanVo monthlyPlanVo) { try { int res = monthlyPlanService.addMonthlyPlanList(monthlyPlanVo); if (res > 0) { @@ -85,7 +82,7 @@ public class MonthlyPlanController extends BaseController { */ @PreAuthorize("@ss.hasPermi('monthly:plan:del')") @PostMapping("/delMonthlyPlan") - public AjaxResult delMonthlyPlan(MonthlyPlanVo monthlyPlanVo) { + public AjaxResult delMonthlyPlan(@RequestBody MonthlyPlanVo monthlyPlanVo) { try { int res = monthlyPlanService.delMonthlyPlanList(monthlyPlanVo); if (res > 0) { @@ -103,7 +100,7 @@ public class MonthlyPlanController extends BaseController { */ @PreAuthorize("@ss.hasPermi('monthly:plan:update')") @PostMapping("/updateMonthlyPlan") - public AjaxResult updateMonthlyPlan(MonthlyPlanVo monthlyPlanVo) { + public AjaxResult updateMonthlyPlan(@RequestBody MonthlyPlanVo monthlyPlanVo) { try { int res = monthlyPlanService.updateMonthlyPlan(monthlyPlanVo); if (res > 0) { 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 23d401d..c070d61 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 @@ -7,6 +7,7 @@ import com.bonus.digital.dao.PersonnelClassificationVo; import com.bonus.digital.service.PersonnelClassificationService; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -45,7 +46,7 @@ public class PersonnelClassificationController extends BaseController { */ @PreAuthorize("@ss.hasPermi('personnel:classification:add')") @PostMapping("/addClassification") - public AjaxResult addClassification(@RequestBody PersonnelClassificationVo personnelClassificationVo) + public AjaxResult addClassification(@RequestBody @Validated PersonnelClassificationVo personnelClassificationVo) { try { int res = personnelClassificationService.addClassification(personnelClassificationVo); @@ -83,7 +84,7 @@ public class PersonnelClassificationController extends BaseController { */ @PreAuthorize("@ss.hasPermi('personnel:classification:update')") @PostMapping("/updateClassification") - public AjaxResult updateClassification(@RequestBody PersonnelClassificationVo personnelClassificationVo) + public AjaxResult updateClassification(@RequestBody @Validated PersonnelClassificationVo personnelClassificationVo) { try { int res = personnelClassificationService.updateClassification(personnelClassificationVo); diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/PlanMajorController.java b/bonus-business/src/main/java/com/bonus/digital/controller/PlanMajorController.java index e68e06d..c545008 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/PlanMajorController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/PlanMajorController.java @@ -8,6 +8,7 @@ import com.bonus.digital.dao.PlanMajorVo; import com.bonus.digital.service.PlanMajorService; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -47,7 +48,7 @@ public class PlanMajorController extends BaseController { */ @PreAuthorize("@ss.hasPermi('plan:major:add')") @PostMapping("/addPlanMajor") - public AjaxResult addPlanMajor(@RequestBody PlanMajorVo planMajorVo) + public AjaxResult addPlanMajor(@RequestBody @Validated PlanMajorVo planMajorVo) { try { int res = planMajorService.addPlanMajor(planMajorVo); @@ -85,7 +86,7 @@ public class PlanMajorController extends BaseController { */ @PreAuthorize("@ss.hasPermi('plan:major:update')") @PostMapping("/updatePlanMajor") - public AjaxResult updatePlanMajor(@RequestBody PlanMajorVo planMajorVo) + public AjaxResult updatePlanMajor(@RequestBody @Validated PlanMajorVo planMajorVo) { try { int res = planMajorService.updatePlanMajor(planMajorVo); diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/WorkloadCategoryController.java b/bonus-business/src/main/java/com/bonus/digital/controller/WorkloadCategoryController.java index 9dc3e64..e95694d 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/WorkloadCategoryController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/WorkloadCategoryController.java @@ -30,14 +30,13 @@ public class WorkloadCategoryController extends BaseController { */ @PreAuthorize("@ss.hasPermi('workload:category:list')") @GetMapping("/getWorkloadCategoryList") - public TableDataInfo getWorkloadCategoryList(WorkloadCategoryVo workloadCategoryVo) - { + public TableDataInfo getWorkloadCategoryList(WorkloadCategoryVo workloadCategoryVo) { try { startPage(); List list = workloadCategoryService.getWorkloadCategoryList(workloadCategoryVo); return getDataTable(list); - }catch (Exception e) { - return getDataTable(null); + } catch (Exception e) { + return getDataTable(null); } } @@ -46,17 +45,16 @@ public class WorkloadCategoryController extends BaseController { */ @PreAuthorize("@ss.hasPermi('workload:category:add')") @PostMapping("/addWorkloadCategory") - public AjaxResult addWorkloadCategory(@RequestBody WorkloadCategoryVo workloadCategoryVo) - { + public AjaxResult addWorkloadCategory(@RequestBody WorkloadCategoryVo workloadCategoryVo) { try { - int res = workloadCategoryService.addWorkloadCategory(workloadCategoryVo); + int res = workloadCategoryService.addWorkloadCategory(workloadCategoryVo); if (res > 0) { return AjaxResult.success(); - }else { + } else { return AjaxResult.error("新增失败"); } - }catch (Exception e) { - return AjaxResult.error("系统异常，请联系管理员"); + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); } } @@ -65,17 +63,16 @@ public class WorkloadCategoryController extends BaseController { */ @PreAuthorize("@ss.hasPermi('workload:category:del')") @PostMapping("/delWorkloadCategory") - public AjaxResult delWorkloadCategory(@RequestBody WorkloadCategoryVo workloadCategoryVo) - { + public AjaxResult delWorkloadCategory(@RequestBody WorkloadCategoryVo workloadCategoryVo) { try { - int res = workloadCategoryService.delWorkloadCategory(workloadCategoryVo); + int res = workloadCategoryService.delWorkloadCategory(workloadCategoryVo); if (res > 0) { return AjaxResult.success(); - }else { + } else { return AjaxResult.error("删除失败"); } - }catch (Exception e) { - return AjaxResult.error("系统异常，请联系管理员"); + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); } } @@ -84,17 +81,16 @@ public class WorkloadCategoryController extends BaseController { */ @PreAuthorize("@ss.hasPermi('workload:category:update')") @PostMapping("/updateWorkloadCategory") - public AjaxResult updateWorkloadCategory(@RequestBody WorkloadCategoryVo workloadCategoryVo) - { + public AjaxResult updateWorkloadCategory(@RequestBody WorkloadCategoryVo workloadCategoryVo) { try { - int res = workloadCategoryService.updateWorkloadCategory(workloadCategoryVo); + int res = workloadCategoryService.updateWorkloadCategory(workloadCategoryVo); if (res > 0) { return AjaxResult.success(); - }else { + } else { return AjaxResult.error("修改失败"); } - }catch (Exception e) { - return AjaxResult.error("系统异常，请联系管理员"); + } catch (Exception e) { + return AjaxResult.error("系统异常，请联系管理员"); } } } diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/InspectionStationVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/InspectionStationVo.java index 104f82d..e663a9c 100644 --- a/bonus-business/src/main/java/com/bonus/digital/dao/InspectionStationVo.java +++ b/bonus-business/src/main/java/com/bonus/digital/dao/InspectionStationVo.java @@ -1,7 +1,9 @@ package com.bonus.digital.dao; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -19,11 +21,14 @@ public class InspectionStationVo { /** * 单位名称 */ + @NotBlank(message = "名称不能为空") + @Length(max = 50, message = "名称不能超过50个字符") private String inspectionStationName; /** * 备注 */ + @Length(max = 200,message = "备注不能超过200个字符") private String remark; /** diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/PersonnelClassificationVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/PersonnelClassificationVo.java index 136bced..f6a575d 100644 --- a/bonus-business/src/main/java/com/bonus/digital/dao/PersonnelClassificationVo.java +++ b/bonus-business/src/main/java/com/bonus/digital/dao/PersonnelClassificationVo.java @@ -1,7 +1,9 @@ package com.bonus.digital.dao; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -19,11 +21,14 @@ public class PersonnelClassificationVo { /** * 人员分类名称 */ + @NotBlank(message = "名称不能为空") + @Length(max = 50, message = "名称不能超过50个字符") private String personnelClassificationName; /** * 备注 */ + @Length(max = 200, message = "名称不能超过200个字符") private String remark; /** diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/PlanMajorVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/PlanMajorVo.java index 956bc18..8cffd67 100644 --- a/bonus-business/src/main/java/com/bonus/digital/dao/PlanMajorVo.java +++ b/bonus-business/src/main/java/com/bonus/digital/dao/PlanMajorVo.java @@ -1,7 +1,9 @@ package com.bonus.digital.dao; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -19,11 +21,14 @@ public class PlanMajorVo { /** * 计划专业名称 */ + @NotBlank(message = "名称不能为空") + @Length(max = 50,message = "名称长度不能超过50") private String planMajorName; /** * 备注 */ + @Length(max = 200,message = "备注长度不能超过200") private String remark; /** diff --git a/bonus-business/src/main/resources/mapper/InspectionStationMapper.xml b/bonus-business/src/main/resources/mapper/InspectionStationMapper.xml index 0c6cde0..dd726ab 100644 --- a/bonus-business/src/main/resources/mapper/InspectionStationMapper.xml +++ b/bonus-business/src/main/resources/mapper/InspectionStationMapper.xml @@ -32,6 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select personnel_classification_id,personnel_classification_name,remark,category from tb_personnel_classification where category = #{category} and is_active = '1' + + and personnel_classification_name like concat('%',#{personnelClassificationName},'%') + diff --git a/bonus-business/src/main/resources/mapper/PlanMajorMapper.xml b/bonus-business/src/main/resources/mapper/PlanMajorMapper.xml index 41b9a7f..c9bc400 100644 --- a/bonus-business/src/main/resources/mapper/PlanMajorMapper.xml +++ b/bonus-business/src/main/resources/mapper/PlanMajorMapper.xml @@ -32,5 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/bonus-business/src/main/resources/mapper/WorkloadCategoryMapper.xml b/bonus-business/src/main/resources/mapper/WorkloadCategoryMapper.xml index 399cd13..80e0707 100644 --- a/bonus-business/src/main/resources/mapper/WorkloadCategoryMapper.xml +++ b/bonus-business/src/main/resources/mapper/WorkloadCategoryMapper.xml @@ -35,5 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"