diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java index 062415834a..f6369613bf 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java @@ -53,29 +53,29 @@ import java.util.Date; public class BusMainDeposit extends BaseEntity { private static final long serialVersionUID = 1L; - - @ApiModelProperty("单据编号(制定编号规则:单据类型编号+部门编码+yyyyMMDD+0000)") + + @ApiModelProperty("单据编号(制定编号规则:单据类型编号+部门编码+yyyyMMDD+0000)") private String billNo; - - @ApiModelProperty("业务员Sid(是不是应该是二级?)") + + @ApiModelProperty("业务员Sid(是不是应该是二级?)") private String staffSid; - - @ApiModelProperty("业务员姓名") + + @ApiModelProperty("业务员姓名") private String staffName; - - @ApiModelProperty("组织机构sid") + + @ApiModelProperty("组织机构sid") private String orgSid; - - @ApiModelProperty("部门名称") + + @ApiModelProperty("部门名称") private String orgName; - - @ApiModelProperty("制单日期") + + @ApiModelProperty("制单日期") private String createDate; @ApiModelProperty("单据类型key") private String depositBillTypeKey; - - @ApiModelProperty("单据类型") + + @ApiModelProperty("单据类型") private String depositBillType; @ApiModelProperty("流程定义的id") @@ -84,4 +84,7 @@ public class BusMainDeposit extends BaseEntity { private String nodeSid; @ApiModelProperty("流程实例的sid") private String procInstSid; + + @ApiModelProperty(value = "节点状态") + private String nodeState; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index c11773a85a..c91e79f3ff 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -341,11 +341,11 @@ public class BusMainDepositService extends MybatisBaseService