diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/form/CaseClinicalArticleQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/form/CaseClinicalArticleQueryForm.java index 02d9dd7..747f10b 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/form/CaseClinicalArticleQueryForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/form/CaseClinicalArticleQueryForm.java @@ -26,7 +26,7 @@ public class CaseClinicalArticleQueryForm extends PageParam { private Integer articleStatus; @Schema(description = "删除状态") - private Integer deleteStatus; + private Integer deleteStatus = 0; @Schema(description = "发表时间") private LocalDate pushDateBegin; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/form/CaseClinicalVideoQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/form/CaseClinicalVideoQueryForm.java index 13be4bf..0ac1e6d 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/form/CaseClinicalVideoQueryForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/form/CaseClinicalVideoQueryForm.java @@ -26,7 +26,7 @@ public class CaseClinicalVideoQueryForm extends PageParam { private Integer videoStatus; @Schema(description = "删除状态") - private Integer deleteStatus; + private Integer deleteStatus = 0; @Schema(description = "发表时间") private LocalDate pushDateBegin; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/domain/form/CaseExchangeQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/domain/form/CaseExchangeQueryForm.java index 390e1ac..016174d 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/domain/form/CaseExchangeQueryForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/domain/form/CaseExchangeQueryForm.java @@ -25,4 +25,7 @@ public class CaseExchangeQueryForm extends PageParam { @Schema(description = "是否被精选(0:否 1:是)") private Integer isSelected; + + @Schema(description = "deleteStatus(0:否 1:是)") + private Integer deleteStatus = 0; } diff --git a/sa-admin/src/main/resources/mapper/business/caseClinicalArticle/CaseClinicalArticleMapper.xml b/sa-admin/src/main/resources/mapper/business/caseClinicalArticle/CaseClinicalArticleMapper.xml index 469fd4e..578389b 100644 --- a/sa-admin/src/main/resources/mapper/business/caseClinicalArticle/CaseClinicalArticleMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseClinicalArticle/CaseClinicalArticleMapper.xml @@ -45,7 +45,9 @@ ) - AND case_clinical_article.delete_status = 0 + + AND case_clinical_article.delete_status = #{queryForm.deleteStatus} + AND case_clinical_article.article_status = #{queryForm.articleStatus} diff --git a/sa-admin/src/main/resources/mapper/business/caseClinicalVideo/CaseClinicalVideoMapper.xml b/sa-admin/src/main/resources/mapper/business/caseClinicalVideo/CaseClinicalVideoMapper.xml index 89b7d05..1fc03eb 100644 --- a/sa-admin/src/main/resources/mapper/business/caseClinicalVideo/CaseClinicalVideoMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseClinicalVideo/CaseClinicalVideoMapper.xml @@ -45,7 +45,9 @@ ) - AND case_clinical_video.delete_status = 0 + + AND case_clinical_video.delete_status = #{queryForm.deleteStatus} + AND case_clinical_video.video_status = #{queryForm.videoStatus} diff --git a/sa-admin/src/main/resources/mapper/business/caseExchange/CaseExchangeMapper.xml b/sa-admin/src/main/resources/mapper/business/caseExchange/CaseExchangeMapper.xml index f56e7d9..3d41ce1 100644 --- a/sa-admin/src/main/resources/mapper/business/caseExchange/CaseExchangeMapper.xml +++ b/sa-admin/src/main/resources/mapper/business/caseExchange/CaseExchangeMapper.xml @@ -46,6 +46,9 @@ AND case_exchange.is_selected = #{queryForm.isSelected} + + AND case_exchange.delete_status = #{queryForm.isSelected} + ORDER BY case_exchange.created_at DESC