diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/form/CaseClinicalArticleAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/form/CaseClinicalArticleAddForm.java index f799fd6..25ac75d 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/form/CaseClinicalArticleAddForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/form/CaseClinicalArticleAddForm.java @@ -35,8 +35,7 @@ public class CaseClinicalArticleAddForm { @NotNull(message = "发表时间 不能为空") private LocalDateTime pushDate; - @Schema(description = "是否外部链接（0:否 1:是）", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "是否外部链接（0:否 1:是） 不能为空") + @Schema(description = "是否外部链接（0:否 1:是）") private Integer isLink; @Schema(description = "外部链接地址") @@ -46,8 +45,7 @@ public class CaseClinicalArticleAddForm { @JsonDeserialize(using = FileKeyVoDeserializer.class) private String shareQrcode; - @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "内容 不能为空") + @Schema(description = "内容") private String articleContent; @Schema(description = "作者列表") diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/vo/UserCommentClinicalArticleVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/vo/UserCommentClinicalArticleVO.java index 8a04214..c009ee1 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/vo/UserCommentClinicalArticleVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/vo/UserCommentClinicalArticleVO.java @@ -22,6 +22,9 @@ public class UserCommentClinicalArticleVO { @Schema(description = "用户名称") private String userName; + @Schema(description = "医院名称") + private String hospitalName; + @Schema(description = "父级ID") private Long parentId; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/form/CaseClinicalVideoAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/form/CaseClinicalVideoAddForm.java index 2fb7e94..d8e474d 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/form/CaseClinicalVideoAddForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/form/CaseClinicalVideoAddForm.java @@ -36,16 +36,14 @@ public class CaseClinicalVideoAddForm { @NotNull(message = "删除状态（0:否 1:是） 不能为空") private Integer deleteStatus; - @Schema(description = "视频编号（保利）", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "视频编号 不能为空") + @Schema(description = "视频编号（保利）") private String videoNo; @Schema(description = "发表时间", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "发表时间 不能为空") private LocalDateTime pushDate; - @Schema(description = "是否外部链接（0:否 1:是）", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "是否外部链接（0:否 1:是） 不能为空") + @Schema(description = "是否外部链接（0:否 1:是）") private Integer isLink; @Schema(description = "外部链接地址") diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/vo/UserCommentClinicalVideoVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/vo/UserCommentClinicalVideoVO.java index ef441fb..15496b3 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/vo/UserCommentClinicalVideoVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/vo/UserCommentClinicalVideoVO.java @@ -22,6 +22,9 @@ public class UserCommentClinicalVideoVO { @Schema(description = "用户名称") private String userName; + @Schema(description = "医院名称") + private String hospitalName; + @Schema(description = "父级ID") private Long parentId; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/domain/vo/UserCommentExchangeVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/domain/vo/UserCommentExchangeVO.java index c6f397b..263d588 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/domain/vo/UserCommentExchangeVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/domain/vo/UserCommentExchangeVO.java @@ -22,6 +22,9 @@ public class UserCommentExchangeVO { @Schema(description = "用户名称") private String userName; + @Schema(description = "医院名称") + private String hospitalName; + @Schema(description = "父级ID") private Long parentId; diff --git a/sa-admin/src/main/resources/mapper/business/caseClinicalArticle/UserCommentClinicalArticleMapper.xml b/sa-admin/src/main/resources/mapper/business/caseClinicalArticle/UserCommentClinicalArticleMapper.xml index b2c72e0..89924c8 100644 --- a/sa-admin/src/main/resources/mapper/business/caseClinicalArticle/UserCommentClinicalArticleMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseClinicalArticle/UserCommentClinicalArticleMapper.xml @@ -6,6 +6,7 @@ user_comment_clinical_article.comment_id, user.user_name, + basic_hospital.hospital_name, user_comment_clinical_article.status, user_comment_clinical_article.parent_id, user_comment_clinical_article.is_sensitive, @@ -25,6 +26,7 @@ FROM user_comment_clinical_article LEFT JOIN user ON user_comment_clinical_article.user_id = user.user_id + LEFT JOIN basic_hospital ON user.hospital_id = basic_hospital.hospital_id LEFT JOIN case_clinical_article ON user_comment_clinical_article.article_id = case_clinical_article.article_id diff --git a/sa-admin/src/main/resources/mapper/business/caseClinicalVideo/UserCommentClinicalVideoMapper.xml b/sa-admin/src/main/resources/mapper/business/caseClinicalVideo/UserCommentClinicalVideoMapper.xml index b7db11a..4868804 100644 --- a/sa-admin/src/main/resources/mapper/business/caseClinicalVideo/UserCommentClinicalVideoMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseClinicalVideo/UserCommentClinicalVideoMapper.xml @@ -6,6 +6,7 @@ user_comment_clinical_video.comment_id, user.user_name, + basic_hospital.hospital_name, user_comment_clinical_video.status, user_comment_clinical_video.parent_id, user_comment_clinical_video.is_sensitive, @@ -25,6 +26,7 @@ FROM user_comment_clinical_video LEFT JOIN user ON user_comment_clinical_video.user_id = user.user_id + LEFT JOIN basic_hospital ON user.hospital_id = basic_hospital.hospital_id LEFT JOIN case_clinical_video ON user_comment_clinical_video.video_id = case_clinical_video.video_id diff --git a/sa-admin/src/main/resources/mapper/business/caseExchange/UserCommentExchangeMapper.xml b/sa-admin/src/main/resources/mapper/business/caseExchange/UserCommentExchangeMapper.xml index 3aa8361..f4ccdfe 100644 --- a/sa-admin/src/main/resources/mapper/business/caseExchange/UserCommentExchangeMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseExchange/UserCommentExchangeMapper.xml @@ -6,6 +6,7 @@ user_comment_exchange.comment_id, user.user_name, + basic_hospital.hospital_name, user_comment_exchange.status, user_comment_exchange.parent_id, user_comment_exchange.is_sensitive, @@ -25,6 +26,7 @@ FROM user_comment_exchange LEFT JOIN user ON user_comment_exchange.user_id = user.user_id + LEFT JOIN basic_hospital ON user.hospital_id = basic_hospital.hospital_id LEFT JOIN case_exchange ON user_comment_exchange.exchange_id = case_exchange.exchange_id