Skip to content

J
jiedao-api-boot-master
Commit 385c7ee6 authored by zhengyi's avatar zhengyi
Browse files
Options

审批初始化默认值修改

parent 30944c3a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java
View file @ 385c7ee6
...@@ -573,7 +573,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont ...@@ -573,7 +573,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
OrderCargoControlReleaseInfoDto releaseInfoDto = this.getOrderCargoControlReleaseInfo(orderId); OrderCargoControlReleaseInfoDto releaseInfoDto = this.getOrderCargoControlReleaseInfo(orderId);
OrderCargoControlApplyVO orderCargoControlApplyVO = new OrderCargoControlApplyVO(); OrderCargoControlApplyVO orderCargoControlApplyVO = new OrderCargoControlApplyVO();
BeanUtils.copyProperties(releaseInfoDto, orderCargoControlApplyVO); BeanUtils.copyProperties(releaseInfoDto, orderCargoControlApplyVO);
orderCargoControlApplyVO.setApplyStatus(1); orderCargoControlApplyVO.setApplyStatus(0);
return orderCargoControlApplyVO; return orderCargoControlApplyVO;
} else { } else {
OrderCargoControlApplyVO applyVO = JSONObject.parseObject(orderApprovalDO.getDetails(), OrderCargoControlApplyVO.class); OrderCargoControlApplyVO applyVO = JSONObject.parseObject(orderApprovalDO.getDetails(), OrderCargoControlApplyVO.class);
...@@ -589,7 +589,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont ...@@ -589,7 +589,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
OrderCargoControlReleaseInfoDto releaseInfoDto = this.getOrderCargoControlReleaseInfo(orderId); OrderCargoControlReleaseInfoDto releaseInfoDto = this.getOrderCargoControlReleaseInfo(orderId);
OrderCargoControlApplyVO orderCargoControlApplyVO = new OrderCargoControlApplyVO(); OrderCargoControlApplyVO orderCargoControlApplyVO = new OrderCargoControlApplyVO();
BeanUtils.copyProperties(releaseInfoDto, orderCargoControlApplyVO); BeanUtils.copyProperties(releaseInfoDto, orderCargoControlApplyVO);
orderCargoControlApplyVO.setApplyStatus(1); orderCargoControlApplyVO.setApplyStatus(0);
return orderCargoControlApplyVO; return orderCargoControlApplyVO;
} else { } else {
OrderCargoControlApplyVO applyVO = JSONObject.parseObject(orderApprovalDO.getDetails(), OrderCargoControlApplyVO.class); OrderCargoControlApplyVO applyVO = JSONObject.parseObject(orderApprovalDO.getDetails(), OrderCargoControlApplyVO.class);
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderCargoControl/OrderCargoControlApplyVO.java
View file @ 385c7ee6
...@@ -93,8 +93,8 @@ public class OrderCargoControlApplyVO { ...@@ -93,8 +93,8 @@ public class OrderCargoControlApplyVO {
@ApiModelProperty(value = "修改原因") @ApiModelProperty(value = "修改原因")
private String reasonZh; private String reasonZh;
@ApiModelProperty(value = "审批状态: 1 处理中 2 通过 3 不通过 4 已取消") @ApiModelProperty(value = "审批状态: 0 初始化待处理 1 处理中 2 通过 3 不通过 4 已取消")
private Integer applyStatus = 1; private Integer applyStatus = 0;
@ApiModelProperty(value = "抄送人(id逗号拼接)") @ApiModelProperty(value = "抄送人(id逗号拼接)")
private String ccIds; private String ccIds;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment