Browse Source

销售虚拟订单添加节点状态字段及放开关于验证是否可修改的注释

master
dimengzhe 3 years ago
parent
commit
6b2094c03f
  1. 17
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java
  2. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

17
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java

@ -54,28 +54,28 @@ 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;
}

10
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<BusMainDepositMapp
* @return
*/
private boolean checkCouldChange(String sid) {
// BusMainDeposit busMainDeposit = fetchBySid(sid);
// // 判断是否可以更改(是否走了流程,更改了状态)
// if (StringUtils.isNotBlank(busMainDeposit.getNodeState())) {
// return true;
// }
BusMainDeposit busMainDeposit = fetchBySid(sid);
// 判断是否可以更改(是否走了流程,更改了状态)
if (StringUtils.isNotBlank(busMainDeposit.getNodeState())) {
return true;
}
return false;
}

Loading…
Cancel
Save