Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-14 11:47:43 +08:00
commit 4e370a94ee
1 changed files with 14 additions and 0 deletions

View File

@ -2,12 +2,14 @@ package io.renren.modules.demandComment.dto;
import io.renren.common.dto.AuditingBaseDTO;
import io.renren.modules.demanData.dto.TDemandDataDTO;
import io.renren.modules.demandComment.entity.TDemandCommentEntityDelFlag;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.Optional;
/**
* 需求评论
@ -45,6 +47,8 @@ public class TDemandCommentDTO extends AuditingBaseDTO implements Serializable {
private String note5;
@ApiModelProperty(value = "删除标志0:正常1:已删除2:待审核3:审核中9其他")
private Integer delFlag;
@ApiModelProperty(value = "删除标志tip0:正常1:已删除2:待审核3:审核中9其他")
private String delFlagTip;
@ApiModelProperty(value = "评论所属需求主题")
private TDemandDataDTO demandDataDTO;
@ -52,4 +56,14 @@ public class TDemandCommentDTO extends AuditingBaseDTO implements Serializable {
@ApiModelProperty(value = "申请单号")
private String applyNumber;
public String getDelFlagTip() {
if (this.delFlag != null) {
Optional<TDemandCommentEntityDelFlag> resourceEntityDelFlagOptional = Optional.ofNullable(TDemandCommentEntityDelFlag.getByFlag(this.delFlag));
if (resourceEntityDelFlagOptional.isPresent()) {
return resourceEntityDelFlagOptional.get().getTip();
}
}
return "";
}
}