Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
385c7ee6
Commit
385c7ee6
authored
Aug 31, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
审批初始化默认值修改
parent
30944c3a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
OrderCargoControlServiceImpl.java
...rvice/orderCargoControl/OrderCargoControlServiceImpl.java
+2
-2
OrderCargoControlApplyVO.java
.../order/vo/orderCargoControl/OrderCargoControlApplyVO.java
+2
-2
No files found.
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
OrderCargoControlReleaseInfoDto
releaseInfoDto
=
this
.
getOrderCargoControlReleaseInfo
(
orderId
);
OrderCargoControlApplyVO
orderCargoControlApplyVO
=
new
OrderCargoControlApplyVO
();
BeanUtils
.
copyProperties
(
releaseInfoDto
,
orderCargoControlApplyVO
);
orderCargoControlApplyVO
.
setApplyStatus
(
1
);
orderCargoControlApplyVO
.
setApplyStatus
(
0
);
return
orderCargoControlApplyVO
;
}
else
{
OrderCargoControlApplyVO
applyVO
=
JSONObject
.
parseObject
(
orderApprovalDO
.
getDetails
(),
OrderCargoControlApplyVO
.
class
);
...
...
@@ -589,7 +589,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
OrderCargoControlReleaseInfoDto
releaseInfoDto
=
this
.
getOrderCargoControlReleaseInfo
(
orderId
);
OrderCargoControlApplyVO
orderCargoControlApplyVO
=
new
OrderCargoControlApplyVO
();
BeanUtils
.
copyProperties
(
releaseInfoDto
,
orderCargoControlApplyVO
);
orderCargoControlApplyVO
.
setApplyStatus
(
1
);
orderCargoControlApplyVO
.
setApplyStatus
(
0
);
return
orderCargoControlApplyVO
;
}
else
{
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 {
@ApiModelProperty
(
value
=
"修改原因"
)
private
String
reasonZh
;
@ApiModelProperty
(
value
=
"审批状态: 1 处理中 2 通过 3 不通过 4 已取消"
)
private
Integer
applyStatus
=
1
;
@ApiModelProperty
(
value
=
"审批状态:
0 初始化待处理
1 处理中 2 通过 3 不通过 4 已取消"
)
private
Integer
applyStatus
=
0
;
@ApiModelProperty
(
value
=
"抄送人(id逗号拼接)"
)
private
String
ccIds
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment