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 f59c091..8a04214 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 = "父级ID") + private Long parentId; + @Schema(description = "评论状态（0:禁用 1:正常）") private Integer status; 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 64c5301..ef441fb 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 = "父级ID") + private Long parentId; + @Schema(description = "评论状态（0:禁用 1:正常）") private Integer status; 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 1b1a566..c6f397b 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 = "父级ID") + private Long parentId; + @Schema(description = "评论状态（0:禁用 1:正常）") private Integer status; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/service/CaseExchangeService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/service/CaseExchangeService.java index 9dac505..aad0c29 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/service/CaseExchangeService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/service/CaseExchangeService.java @@ -337,7 +337,7 @@ public class CaseExchangeService { if (isSelected == 1){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CaseClinicalRecordScoreEntity::getId, exchangeId); - queryWrapper.eq(CaseClinicalRecordScoreEntity::getType, caseExchange.getUserId()); + queryWrapper.eq(CaseClinicalRecordScoreEntity::getType, 3); queryWrapper.eq(CaseClinicalRecordScoreEntity::getUserId, caseExchange.getUserId()); queryWrapper.eq(CaseClinicalRecordScoreEntity::getScoreType, 6); CaseClinicalRecordScoreEntity caseClinicalRecordScore = caseClinicalRecordScoreDao.selectOne(queryWrapper); @@ -380,7 +380,7 @@ public class CaseExchangeService { if (auditStatus == 1){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CaseClinicalRecordScoreEntity::getId, exchangeId); - queryWrapper.eq(CaseClinicalRecordScoreEntity::getType, caseExchange.getUserId()); + queryWrapper.eq(CaseClinicalRecordScoreEntity::getType, 3); queryWrapper.eq(CaseClinicalRecordScoreEntity::getUserId, caseExchange.getUserId()); queryWrapper.eq(CaseClinicalRecordScoreEntity::getScoreType, 7); CaseClinicalRecordScoreEntity caseClinicalRecordScore = caseClinicalRecordScoreDao.selectOne(queryWrapper); 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 54bfd7b..b2c72e0 100644 --- a/sa-admin/src/main/resources/mapper/business/caseClinicalArticle/UserCommentClinicalArticleMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseClinicalArticle/UserCommentClinicalArticleMapper.xml @@ -7,6 +7,7 @@ user_comment_clinical_article.comment_id, user.user_name, user_comment_clinical_article.status, + user_comment_clinical_article.parent_id, user_comment_clinical_article.is_sensitive, user_comment_clinical_article.is_top, user_comment_clinical_article.like_num, 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 24e59c0..b7db11a 100644 --- a/sa-admin/src/main/resources/mapper/business/caseClinicalVideo/UserCommentClinicalVideoMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseClinicalVideo/UserCommentClinicalVideoMapper.xml @@ -7,6 +7,7 @@ user_comment_clinical_video.comment_id, user.user_name, user_comment_clinical_video.status, + user_comment_clinical_video.parent_id, user_comment_clinical_video.is_sensitive, user_comment_clinical_video.is_top, user_comment_clinical_video.like_num, 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 6d31628..3aa8361 100644 --- a/sa-admin/src/main/resources/mapper/business/caseExchange/UserCommentExchangeMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseExchange/UserCommentExchangeMapper.xml @@ -7,6 +7,7 @@ user_comment_exchange.comment_id, user.user_name, user_comment_exchange.status, + user_comment_exchange.parent_id, user_comment_exchange.is_sensitive, user_comment_exchange.is_top, user_comment_exchange.like_num,