BJ_FS / urbanops

Commit 6fa1b574f8d39083bc670697ebda5aaa5215dd6d

Authored by wangqian
1 parent aef93329

角色及用户创建修改增加业务线字段

Inline Side-by-side
Showing 6 changed files with 20 additions and 2 deletions
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RolePageReqVO.java
  View file @6fa1b57
... ... @@ -28,4 +28,6 @@ public class RolePageReqVO extends PageParam {
28 28 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
29 29 private LocalDateTime[] createTime;
30 30  
  31 + @Schema(description = "业务线", example = "yl")
  32 + private String busiLine;
31 33 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleRespVO.java
  View file @6fa1b57
1 1 package com.zteits.urbanops.module.system.controller.admin.permission.vo.role;
2 2  
  3 +import com.mzt.logapi.starter.annotation.DiffLogField;
3 4 import com.zteits.urbanops.framework.excel.core.annotations.DictFormat;
4 5 import com.zteits.urbanops.framework.excel.core.convert.DictConvert;
5 6 import com.zteits.urbanops.module.system.enums.DictTypeConstants;
... ... @@ -7,6 +8,7 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
7 8 import cn.idev.excel.annotation.ExcelProperty;
8 9 import io.swagger.v3.oas.annotations.media.Schema;
9 10 import jakarta.validation.constraints.NotBlank;
  11 +import jakarta.validation.constraints.Size;
10 12 import lombok.Data;
11 13  
12 14 import java.time.LocalDateTime;
... ... @@ -56,4 +58,6 @@ public class RoleRespVO {
56 58 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
57 59 private LocalDateTime createTime;
58 60  
  61 + @Schema(description = "业务线", example = "yl")
  62 + private String busiLine;
59 63 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java
  View file @6fa1b57
... ... @@ -44,4 +44,8 @@ public class RoleSaveReqVO {
44 44 @DiffLogField(name = "备注")
45 45 private String remark;
46 46  
  47 + @Schema(description = "业务线：yl-园林；wy-物业；sz-市政", example = "yl")
  48 + @DiffLogField(name = "业务线")
  49 + //@NotNull(message = "业务线不能为空")
  50 + private String busiLine;
47 51 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserPageReqVO.java
  View file @6fa1b57
... ... @@ -38,4 +38,7 @@ public class UserPageReqVO extends PageParam {
38 38 @Schema(description = "角色编号", example = "1024")
39 39 private Long roleId;
40 40  
  41 + @Schema(description = "业务线：yl-园林；wy-物业；sz-市政", example = "yl")
  42 + private String busiLine;
  43 +
41 44 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserRespVO.java
  View file @6fa1b57
1 1 package com.zteits.urbanops.module.system.controller.admin.user.vo.user;
2 2  
  3 +import com.mzt.logapi.starter.annotation.DiffLogField;
3 4 import com.zteits.urbanops.framework.excel.core.annotations.DictFormat;
4 5 import com.zteits.urbanops.framework.excel.core.convert.DictConvert;
5 6 import com.zteits.urbanops.module.system.enums.DictTypeConstants;
... ... @@ -71,5 +72,6 @@ public class UserRespVO{
71 72  
72 73 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
73 74 private LocalDateTime createTime;
74   -
  75 + @Schema(description = "业务线：yl-园林；wy-物业；sz-市政", example = "yl")
  76 + private String busiLine;
75 77 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
  View file @6fa1b57
... ... @@ -76,5 +76,8 @@ public class UserSaveReqVO {
76 76 return id != null // 修改时，不需要传递
77 77 || (ObjectUtil.isAllNotEmpty(password)); // 新增时，必须都传递 password
78 78 }
79   -
  79 + @Schema(description = "业务线：yl-园林；wy-物业；sz-市政", example = "yl")
  80 + @DiffLogField(name = "业务线")
  81 + //@NotNull(message = "业务线不能为空")
  82 + private String busiLine;
80 83 }
... ...