From 7a28fb335ee4eb588ddf5e3820ac321f6b658144 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Wed, 30 Oct 2024 10:01:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/home/controller/admin/clgl/vo/ClglPageReqVO.java | 3 +++ .../module/home/controller/admin/clgl/vo/ClglRespVO.java | 6 ++++++ .../module/home/controller/admin/clgl/vo/ClglSaveReqVO.java | 4 ++++ .../yudao/module/home/dal/dataobject/clgl/ClglDO.java | 4 ++++ .../yudao/module/home/dal/mysql/clgl/ClglMapper.java | 2 ++ 5 files changed, 19 insertions(+) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglPageReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglPageReqVO.java index 185a625..65e8514 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglPageReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglPageReqVO.java @@ -30,6 +30,9 @@ public class ClglPageReqVO extends PageParam { @Schema(description = "部门") private Integer dept; + @Schema(description = "部门名字") + private String deptName; + @Schema(description = "用车类型", example = "1") private Integer carType; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglRespVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglRespVO.java index 5a0e2ae..255fd86 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglRespVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglRespVO.java @@ -9,6 +9,8 @@ import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import javax.validation.constraints.NotNull; + @Schema(description = "管理后台 - 车辆管理 Response VO") @Data @ExcelIgnoreUnannotated @@ -37,6 +39,10 @@ public class ClglRespVO { @ExcelProperty("部门") private Integer dept; + @Schema(description = "部门名字", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "部门名字不能为空") + private String deptName; + @Schema(description = "用车类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty(value = "用车类型", converter = DictConvert.class) @DictFormat("clgl_car_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglSaveReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglSaveReqVO.java index 52bc741..0f0686f 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglSaveReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglSaveReqVO.java @@ -29,6 +29,10 @@ public class ClglSaveReqVO { @NotNull(message = "部门不能为空") private Integer dept; + @Schema(description = "部门名字", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "部门名字不能为空") + private String deptName; + @Schema(description = "用车类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "用车类型不能为空") private Integer carType; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/clgl/ClglDO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/clgl/ClglDO.java index e406ed6..08ed7c7 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/clgl/ClglDO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/clgl/ClglDO.java @@ -63,6 +63,10 @@ public class ClglDO extends BaseDO { * 部门 */ private Integer dept; + /** + * 部门名字 + */ + private String deptName; /** * 用车类型 * diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/clgl/ClglMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/clgl/ClglMapper.java index 5092be9..f9f7a52 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/clgl/ClglMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/clgl/ClglMapper.java @@ -23,6 +23,7 @@ public interface ClglMapper extends BaseMapperX { .eqIfPresent(ClglDO::getCarUserId, reqVO.getCarUserId()) .eqIfPresent(ClglDO::getCarUserName, reqVO.getCarUserName()) .eqIfPresent(ClglDO::getDept, reqVO.getDept()) + .eqIfPresent(ClglDO::getDeptName, reqVO.getDeptName()) .eqIfPresent(ClglDO::getCarType, reqVO.getCarType()) .eqIfPresent(ClglDO::getCarDriver, reqVO.getCarDriver()) .eqIfPresent(ClglDO::getCarStart, reqVO.getCarStart()) @@ -42,6 +43,7 @@ public interface ClglMapper extends BaseMapperX { .eqIfPresent(ClglDO::getCarUserId, reqVO.getCarUserId()) .eqIfPresent(ClglDO::getCarUserName, reqVO.getCarUserName()) .eqIfPresent(ClglDO::getDept, reqVO.getDept()) + .eqIfPresent(ClglDO::getDeptName, reqVO.getDeptName()) .eqIfPresent(ClglDO::getCarType, reqVO.getCarType()) .eqIfPresent(ClglDO::getCarDriver, reqVO.getCarDriver()) .eqIfPresent(ClglDO::getCarStart, reqVO.getCarStart())