diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomain.java b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomain.java index 57ae948..f822f68 100644 --- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomain.java +++ b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomain.java @@ -1,5 +1,6 @@ package com.flyfish.framework.approval.domain; +import com.flyfish.framework.annotations.Property; import com.flyfish.framework.approval.enums.ApproveStatus; import com.flyfish.framework.domain.authorized.AuthorizedDomain; import lombok.Getter; @@ -17,11 +18,14 @@ import java.util.List; public abstract class ApprovalDomain extends AuthorizedDomain { // 审批状态 + @Property(readonly = true) private ApproveStatus approveStatus; // 审批人,按序依次审批 + @Property(readonly = true) private List approvers; // 下个审批人 + @Property(readonly = true) private Integer next; } diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainQo.java b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainQo.java new file mode 100644 index 0000000..43fe473 --- /dev/null +++ b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainQo.java @@ -0,0 +1,24 @@ +package com.flyfish.framework.approval.domain; + +import com.flyfish.framework.annotations.EnumValue; +import com.flyfish.framework.annotations.Order; +import com.flyfish.framework.annotations.Property; +import com.flyfish.framework.approval.enums.ApproveStatus; +import com.flyfish.framework.domain.authorized.AuthorizedDomain; +import lombok.Getter; +import lombok.Setter; + +/** + * 带审批的查询实体 + * + * @author wangyu + */ +@Getter +@Setter +public class ApprovalDomainQo extends AuthorizedDomain { + + @Property("审批状态") + @Order(50) + @EnumValue(ApproveStatus.class) + private String status; +}