feat:车牌申请

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/constant/car/CarTypeEnum.java

@@ -0,0 +1,33 @@
+package com.bsd.pjcloud.admin.api.constant.car;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.bsd.pjcloud.admin.api.constant.UserTransactionEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+
+/**
+ * 车辆类型
+ */
+@AllArgsConstructor
+@Getter
+public enum CarTypeEnum {
+
+    SELF("1", "私家车"),
+    PUBLIC("2", "公车"),
+    ARMY("3", "军车"),
+    POLICE("4", "警车"),
+    ;
+    private final String type;
+    private final String description;
+
+    public static CarTypeEnum valueOfByType(String type) {
+        if (ObjectUtil.isEmpty(type)) return null;
+        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
+    }
+
+
+}

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/car/SysUserCarDto.java

@@ -1,21 +1,23 @@
 package com.bsd.pjcloud.admin.api.dto.car;
 
 import com.bsd.pjcloud.admin.api.entity.car.SysUserCarEntity;
-import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
+import com.bsd.pjcloud.admin.api.vo.base.BaseUserDeptInterface;
 import lombok.Data;
 
 @Data
-public class SysUserCarDto extends SysUserCarEntity implements BaseUserInterface {
+public class SysUserCarDto extends SysUserCarEntity implements BaseUserDeptInterface {
 
     /**
      * 用户相关
      */
-    private Long userId;
-
     private String username;
 
     private String userMobile;
 
     private String userAvatar;
 
+    private Long userDeptId;
+
+    private String userDeptName;
+
 }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/car/SysUserCarEntity.java

@@ -3,8 +3,9 @@ package com.bsd.pjcloud.admin.api.entity.car;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
 import com.bsd.pjcloud.common.core.util.TenantTable;
 
 import java.time.LocalDateTime;
@@ -17,6 +18,9 @@ import java.time.LocalDateTime;
 @TableName("sys_user_car")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "车辆管理")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class SysUserCarEntity extends Model<SysUserCarEntity> {
 
 
@@ -31,18 +35,21 @@ public class SysUserCarEntity extends Model<SysUserCarEntity> {
      * 用户ID
      */
     @Schema(description = "用户ID")
+    @NotNull(message = "用户ID不能为空")
     private Long userId;
 
     /**
      * 车牌号
      */
     @Schema(description = "车牌号")
+    @NotEmpty(message = "车牌号不能为空")
     private String carNumber;
 
     /**
      * 车辆类型(字典)
      */
     @Schema(description = "车辆类型(字典)")
+    @NotEmpty(message = "车辆类型不能为空")
     private String carType;
 
     /**
@@ -51,6 +58,24 @@ public class SysUserCarEntity extends Model<SysUserCarEntity> {
     @Schema(description = "启用状态(字典)")
     private String enableStatus;
 
+    /**
+     * 流程id
+     */
+    @Schema(description = "流程id")
+    private String processId;
+
+    /**
+     * 审核状体
+     */
+    @Schema(description = "审核状体")
+    private String processStatus;
+
+    /**
+     * 审核时间
+     */
+    @Schema(description = "审核时间")
+    private LocalDateTime processTime;
+
     /**
      * 创建人
      */

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/car/SysUserCarVo.java

@@ -1,8 +1,23 @@
 package com.bsd.pjcloud.admin.api.vo.car;
 
 import com.bsd.pjcloud.admin.api.entity.car.SysUserCarEntity;
+import com.bsd.pjcloud.admin.api.vo.base.BaseUserDeptInterface;
 import lombok.Data;
 
 @Data
-public class SysUserCarVo extends SysUserCarEntity {
+public class SysUserCarVo extends SysUserCarEntity implements BaseUserDeptInterface {
+
+    /**
+     * 用户相关
+     */
+    private String username;
+
+    private String userMobile;
+
+    private String userAvatar;
+
+    private Long userDeptId;
+
+    private String userDeptName;
+
 }