From 9d2baef834a27e9cbaa902903263066d0cbd5773 Mon Sep 17 00:00:00 2001 From: yangsb Date: Thu, 25 Apr 2024 09:27:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cf/imes/module/system/api/dept/dto/DeptRespDTO.java | 2 +- .../system/controller/admin/dept/vo/dept/DeptRespVO.java | 2 +- .../system/controller/admin/dept/vo/dept/DeptSaveReqVO.java | 6 ++++-- .../controller/admin/organ/vo/organ/OrganExportRespVO.java | 3 +++ .../system/controller/admin/organ/vo/organ/OrganRespVO.java | 4 ++++ .../controller/admin/organ/vo/organ/OrganSaveReqVO.java | 4 ++++ .../cf/imes/module/system/dal/dataobject/dept/DeptDO.java | 2 +- .../module/system/dal/dataobject/organ/OrganizationDO.java | 5 ++++- 8 files changed, 22 insertions(+), 6 deletions(-) diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/dept/dto/DeptRespDTO.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/dept/dto/DeptRespDTO.java index 6b386e520..29acdea92 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/dept/dto/DeptRespDTO.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/dept/dto/DeptRespDTO.java @@ -17,7 +17,7 @@ public class DeptRespDTO { private Long parentId; @Schema(description = "负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long leaderUserId; + private String leader; @Schema(description = "部门状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer status; // 参见 CommonStatusEnum 枚举 diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptRespVO.java index a69cc189b..07de09727 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptRespVO.java @@ -22,7 +22,7 @@ public class DeptRespVO { private Integer sort; @Schema(description = "负责人的用户编号", example = "2048") - private Long leaderUserId; + private String leader; @Schema(description = "联系电话", example = "15601691000") private String phone; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java index 21a9bb343..251a19306 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java @@ -4,6 +4,7 @@ import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.validation.InEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; @@ -32,8 +33,9 @@ public class DeptSaveReqVO { @NotNull(message = "显示顺序不能为空") private Integer sort; - @Schema(description = "负责人的用户编号", example = "2048") - private Long leaderUserId; + @Schema(description = "负责人", example = "2048") + @Length(min = 0, max = 10, message = "负责人不可太长") + private String leader; @Schema(description = "联系电话", example = "15601691000") @Size(max = 11, message = "联系电话长度不能超过11个字符") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganExportRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganExportRespVO.java index a184e4361..bb2a996a6 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganExportRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganExportRespVO.java @@ -75,4 +75,7 @@ public class OrganExportRespVO { @Schema(description = "是否大型数据库") @ExcelProperty("是否大型数据库") private String largeStr; + + @Schema(description = "备注") + private String remark; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganRespVO.java index 5deab86ed..d9eaa09de 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganRespVO.java @@ -52,4 +52,8 @@ public class OrganRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + @Schema(description = "备注") + @ExcelProperty("备注") + private String remark; + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java index f799684be..957db6062 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java @@ -76,4 +76,8 @@ public class OrganSaveReqVO { @Schema(description = "地址") private String address; + @Schema(description = "备注") + @Length(min = 0, max = 200, message = "备注不可太长") + private String remark; + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/dept/DeptDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/dept/DeptDO.java index dcd30a6be..88e2af40a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/dept/DeptDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/dept/DeptDO.java @@ -47,7 +47,7 @@ public class DeptDO extends OrganBaseDO { * * 关联 {@link AdminUserDO#getId()} */ - private Long leaderUserId; + private String leader; /** * 联系电话 */ diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/organ/OrganizationDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/organ/OrganizationDO.java index ff98203b9..4c226f29c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/organ/OrganizationDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/organ/OrganizationDO.java @@ -108,5 +108,8 @@ public class OrganizationDO extends BaseDO { * 数据源编码 */ private String dataSourceCode; - + /** + * 备注 + */ + private String remark; }