Compare commits

..

No commits in common. "503e459db0f07991a2a3c417d16c1868a4800256" and "ced4568e8de31cee52d38784af13c2b9b647e686" have entirely different histories.

7 changed files with 4 additions and 19 deletions

View File

@ -26,7 +26,7 @@ public class CaseClinicalArticleQueryForm extends PageParam {
private Integer articleStatus; private Integer articleStatus;
@Schema(description = "删除状态") @Schema(description = "删除状态")
private Integer deleteStatus = 0; private Integer deleteStatus;
@Schema(description = "发表时间") @Schema(description = "发表时间")
private LocalDate pushDateBegin; private LocalDate pushDateBegin;

View File

@ -2,7 +2,6 @@ package net.lab1024.sa.admin.module.business.caseClinicalArticle.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import com.amazonaws.Response; import com.amazonaws.Response;
import net.lab1024.sa.admin.extend.app.label.GetLabelsResponse; import net.lab1024.sa.admin.extend.app.label.GetLabelsResponse;
@ -53,10 +52,6 @@ public class CaseClinicalArticleLabelService {
List<AppCaseClinicalArticleLabelVO> labelDtoList = new ArrayList<>(); List<AppCaseClinicalArticleLabelVO> labelDtoList = new ArrayList<>();
for (GetLabelsResponse.GetLabelsData d : datas) { for (GetLabelsResponse.GetLabelsData d : datas) {
if (Objects.equals(pid, "0") && Objects.equals(d.getId(), "464")){
continue;
}
AppCaseClinicalArticleLabelVO dto = new AppCaseClinicalArticleLabelVO(); AppCaseClinicalArticleLabelVO dto = new AppCaseClinicalArticleLabelVO();
dto.setAppIden(d.getId()); dto.setAppIden(d.getId());
dto.setLabelName(d.getName()); dto.setLabelName(d.getName());

View File

@ -26,7 +26,7 @@ public class CaseClinicalVideoQueryForm extends PageParam {
private Integer videoStatus; private Integer videoStatus;
@Schema(description = "删除状态") @Schema(description = "删除状态")
private Integer deleteStatus = 0; private Integer deleteStatus;
@Schema(description = "发表时间") @Schema(description = "发表时间")
private LocalDate pushDateBegin; private LocalDate pushDateBegin;

View File

@ -25,7 +25,4 @@ public class CaseExchangeQueryForm extends PageParam {
@Schema(description = "是否被精选0:否 1:是)") @Schema(description = "是否被精选0:否 1:是)")
private Integer isSelected; private Integer isSelected;
@Schema(description = "deleteStatus0:否 1:是)")
private Integer deleteStatus = 0;
} }

View File

@ -45,9 +45,7 @@
) )
</if> </if>
<!--删除状态--> <!--删除状态-->
<if test="queryForm.deleteStatus != null"> AND case_clinical_article.delete_status = 0
AND case_clinical_article.delete_status = #{queryForm.deleteStatus}
</if>
<!--状态--> <!--状态-->
<if test="queryForm.articleStatus != null"> <if test="queryForm.articleStatus != null">
AND case_clinical_article.article_status = #{queryForm.articleStatus} AND case_clinical_article.article_status = #{queryForm.articleStatus}

View File

@ -45,9 +45,7 @@
) )
</if> </if>
<!--删除状态--> <!--删除状态-->
<if test="queryForm.deleteStatus != null"> AND case_clinical_video.delete_status = 0
AND case_clinical_video.delete_status = #{queryForm.deleteStatus}
</if>
<!--状态--> <!--状态-->
<if test="queryForm.videoStatus != null"> <if test="queryForm.videoStatus != null">
AND case_clinical_video.video_status = #{queryForm.videoStatus} AND case_clinical_video.video_status = #{queryForm.videoStatus}

View File

@ -46,9 +46,6 @@
<if test="queryForm.isSelected != null"> <if test="queryForm.isSelected != null">
AND case_exchange.is_selected = #{queryForm.isSelected} AND case_exchange.is_selected = #{queryForm.isSelected}
</if> </if>
<if test="queryForm.deleteStatus != null">
AND case_exchange.delete_status = #{queryForm.deleteStatus}
</if>
</where> </where>
ORDER BY case_exchange.created_at DESC ORDER BY case_exchange.created_at DESC
</select> </select>