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
6e3a3d11
Commit
6e3a3d11
authored
Nov 06, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单费用列表返回批量申请的审批id
parent
1d7bf23c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
OrderFeeApplicationServiceImpl.java
...er/service/order/impl/OrderFeeApplicationServiceImpl.java
+1
-1
OrderFeeApplicationBackVO.java
...der/vo/orderFeeApplication/OrderFeeApplicationBackVO.java
+5
-0
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderFeeApplicationServiceImpl.java
View file @
6e3a3d11
...
...
@@ -186,7 +186,6 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
orderApprovalDO
.
setStatus
(
ApprovalResultStatusEnum
.
processing
.
getValue
());
Long
bpmProcessId
=
orderApprovalService
.
applyAndCreate
(
orderApprovalDO
,
WorkFlowEmus
.
ORDER_BATCH_FREE_APPLY
,
createReqVO
.
getCopyUserId
());
//创建审批流
OrderDO
orderDO
=
orderService
.
selectOne
(
OrderDO:
:
getOrderId
,
createReqVO
.
getOrderId
());
...
...
@@ -195,6 +194,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
//更新费用列表对应的流程申请ID
for
(
OrderFeeApplicationDO
feeApplication
:
batchFeeList
)
{
feeApplication
.
setBatchBpmBusinessId
(
String
.
valueOf
(
bpmProcessId
));
feeApplication
.
setBpmProcessId
(
String
.
valueOf
(
bpmProcessId
));
feeApplication
.
setStatus
(
ApprovalResultStatusEnum
.
processing
.
getValue
());
feeApplicationMapper
.
updateById
(
feeApplication
);
}
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderFeeApplication/OrderFeeApplicationBackVO.java
View file @
6e3a3d11
...
...
@@ -92,6 +92,11 @@ public class OrderFeeApplicationBackVO {
@ApiModelProperty
(
value
=
"审批流程编号"
)
private
String
bpmProcessId
;
@ExcelProperty
(
"批量费用审核时业务主键ID"
)
@ApiModelProperty
(
value
=
"批量费用审核时业务主键ID"
)
private
String
batchBpmBusinessId
;
@ApiModelProperty
(
value
=
"始发仓"
)
private
String
startWarehouse
;
...
...
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