forked from Gitlink/microservices
parent
22f095b01d
commit
fb9da470e1
|
|
@ -66,7 +66,7 @@ public class ZoneResource extends ZoneSort {
|
|||
@ApiModelProperty(value = "资源简介")
|
||||
private String summary;
|
||||
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)")
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿)")
|
||||
private String auditStatus;
|
||||
/**
|
||||
* 是否首页展示(0代表不展示 1代表展示)
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ public class ZoneResourceDataVo {
|
|||
@ApiModelProperty(value = "资源简介")
|
||||
private String summary;
|
||||
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)")
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿)")
|
||||
private String auditStatus;
|
||||
/**
|
||||
* 审核时间
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ public class ZoneResourceInputVo {
|
|||
@NotNull
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)", hidden = true)
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿)", hidden = true)
|
||||
private String auditStatus = "1";
|
||||
@ApiModelProperty(value = "资源简介")
|
||||
private String summary;
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ public class ZoneResourceOpenSearchVo extends BaseEntity {
|
|||
@ApiModelProperty(value = "是否根据下载次数降序排序(与orderByColumn互斥,该属性优先级更高)")
|
||||
private Boolean orderByDownloadCount = false;
|
||||
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)")
|
||||
private String auditStatus;
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿)",hidden = true)
|
||||
private String auditStatus="1";
|
||||
|
||||
public ZoneResource toZoneResource() {
|
||||
ZoneResource target = new ZoneResource();
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ public class ZoneResourceSearchVo extends ZoneResourceOpenSearchVo {
|
|||
@NotNull
|
||||
private Long zoneId;
|
||||
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)")
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿 all:所有)")
|
||||
private String auditStatus;
|
||||
/**
|
||||
* 资源分类:SKILL/MODEL/DATASET(NULL表示原有专区资源)
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public class ZoneResourceUpdateVo {
|
|||
@ApiModelProperty(value = "是否首页展示(0代表不展示 1代表展示)")
|
||||
private String isHomepage;
|
||||
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架)", hidden = true)
|
||||
@ApiModelProperty(value = "审核状态(0:待审核,1:审核通过 2:审核不通过 3:已下架 4:草稿)", hidden = true)
|
||||
private String auditStatus = "1";
|
||||
@ApiModelProperty(value = "备注", hidden = true)
|
||||
private String remark;
|
||||
|
|
|
|||
|
|
@ -62,6 +62,10 @@ public class ZoneConstants {
|
|||
* 资源审核状态-审核通过
|
||||
*/
|
||||
public final static String RESOURCE_AUDIT_PASS = "1";
|
||||
/**
|
||||
* 资源审核状态-所有状态
|
||||
*/
|
||||
public final static String RESOURCE_AUDIT_ALL = "all";
|
||||
/**
|
||||
* 资源审核状态-审核未通过
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -146,10 +146,12 @@
|
|||
<if test="deptId != null ">and zr.dept_id = #{deptId}</if>
|
||||
<if test="createBy != null and createBy != ''">and zr.create_by = #{createBy}</if>
|
||||
<if test="keywords != null and keywords != ''">and zr.keywords like concat('%', #{keywords}, '%')</if>
|
||||
<if test="resourceCategory != null and resourceCategory != ''">and zr.resource_category = #{resourceCategory}</if>
|
||||
<if test="resourceCategory != null and resourceCategory != ''">and zr.resource_category =
|
||||
#{resourceCategory}
|
||||
</if>
|
||||
<choose>
|
||||
<when test="auditStatus != null and auditStatus !=''">
|
||||
and zr.audit_status = #{auditStatus}
|
||||
<if test="auditStatus != 'all'">and zr.audit_status = #{auditStatus}</if>
|
||||
</when>
|
||||
<otherwise>
|
||||
and zr.audit_status = '1'
|
||||
|
|
|
|||
Loading…
Reference in New Issue