车辆管理

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;
 

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 枚举类中

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;

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;
     /**
      * 用车类型
      *

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<ClglDO> {
                 .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<ClglDO> {
                 .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())