修改部门负责人字段,添加组织备注字段

This commit is contained in:
yangsb
2024-04-25 09:27:56 +08:00
parent a2e05e7112
commit 9d2baef834
8 changed files with 22 additions and 6 deletions
@@ -17,7 +17,7 @@ public class DeptRespDTO {
private Long parentId; private Long parentId;
@Schema(description = "负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long leaderUserId; private String leader;
@Schema(description = "部门状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "部门状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer status; // 参见 CommonStatusEnum 枚举 private Integer status; // 参见 CommonStatusEnum 枚举
@@ -22,7 +22,7 @@ public class DeptRespVO {
private Integer sort; private Integer sort;
@Schema(description = "负责人的用户编号", example = "2048") @Schema(description = "负责人的用户编号", example = "2048")
private Long leaderUserId; private String leader;
@Schema(description = "联系电话", example = "15601691000") @Schema(description = "联系电话", example = "15601691000")
private String phone; private String phone;
@@ -4,6 +4,7 @@ import com.cf.imes.framework.common.enums.CommonStatusEnum;
import com.cf.imes.framework.common.validation.InEnum; import com.cf.imes.framework.common.validation.InEnum;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@@ -32,8 +33,9 @@ public class DeptSaveReqVO {
@NotNull(message = "显示顺序不能为空") @NotNull(message = "显示顺序不能为空")
private Integer sort; private Integer sort;
@Schema(description = "负责人的用户编号", example = "2048") @Schema(description = "负责人", example = "2048")
private Long leaderUserId; @Length(min = 0, max = 10, message = "负责人不可太长")
private String leader;
@Schema(description = "联系电话", example = "15601691000") @Schema(description = "联系电话", example = "15601691000")
@Size(max = 11, message = "联系电话长度不能超过11个字符") @Size(max = 11, message = "联系电话长度不能超过11个字符")
@@ -75,4 +75,7 @@ public class OrganExportRespVO {
@Schema(description = "是否大型数据库") @Schema(description = "是否大型数据库")
@ExcelProperty("是否大型数据库") @ExcelProperty("是否大型数据库")
private String largeStr; private String largeStr;
@Schema(description = "备注")
private String remark;
} }
@@ -52,4 +52,8 @@ public class OrganRespVO {
@ExcelProperty("创建时间") @ExcelProperty("创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@Schema(description = "备注")
@ExcelProperty("备注")
private String remark;
} }
@@ -76,4 +76,8 @@ public class OrganSaveReqVO {
@Schema(description = "地址") @Schema(description = "地址")
private String address; private String address;
@Schema(description = "备注")
@Length(min = 0, max = 200, message = "备注不可太长")
private String remark;
} }
@@ -47,7 +47,7 @@ public class DeptDO extends OrganBaseDO {
* *
* 关联 {@link AdminUserDO#getId()} * 关联 {@link AdminUserDO#getId()}
*/ */
private Long leaderUserId; private String leader;
/** /**
* 联系电话 * 联系电话
*/ */
@@ -108,5 +108,8 @@ public class OrganizationDO extends BaseDO {
* 数据源编码 * 数据源编码
*/ */
private String dataSourceCode; private String dataSourceCode;
/**
* 备注
*/
private String remark;
} }