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
e33fdbbf
Commit
e33fdbbf
authored
Nov 06, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改费用后重新审批bug修复
parent
13803228
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
OrderFeeApplicationServiceImpl.java
...er/service/order/impl/OrderFeeApplicationServiceImpl.java
+9
-2
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 @
e33fdbbf
...
@@ -217,10 +217,17 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
...
@@ -217,10 +217,17 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
// 更新
// 更新
OrderFeeApplicationDO
updateObj
=
OrderFeeApplicationConvert
.
INSTANCE
.
convert
(
updateReqVO
);
OrderFeeApplicationDO
updateObj
=
OrderFeeApplicationConvert
.
INSTANCE
.
convert
(
updateReqVO
);
Long
userId
=
SecurityFrameworkUtils
.
getLoginUserId
();
Long
userId
=
SecurityFrameworkUtils
.
getLoginUserId
();
String
bpmProcessId
=
bpmCreateServiceFactory
.
createBmp
(
userId
,
updateObj
.
getId
(),
WorkFlowEmus
.
ORDER_FREE_APPLY
.
getKey
(),
orderDO
.
getOrderNo
(),
updateReqVO
.
getCopyUserId
());
//创建审批单,发起流程
OrderApprovalDO
orderApprovalDO
=
new
OrderApprovalDO
();
orderApprovalDO
.
setFollowUpSalesmanId
(
String
.
valueOf
(
SecurityFrameworkUtils
.
getLoginUserId
()));
orderApprovalDO
.
setOrderId
(
updateReqVO
.
getOrderId
());
//批量费用申请
orderApprovalDO
.
setType
(
expense_apply
.
getValue
());
orderApprovalDO
.
setStatus
(
ApprovalResultStatusEnum
.
processing
.
getValue
());
Long
bpmProcessId
=
orderApprovalService
.
applyAndCreate
(
orderApprovalDO
,
WorkFlowEmus
.
ORDER_BATCH_FREE_APPLY
,
updateReqVO
.
getCopyUserId
());
Integer
auditType
=
OrderApprovalTypeResultEnum
.
expense_apply_processing
.
getType
();
Integer
auditType
=
OrderApprovalTypeResultEnum
.
expense_apply_processing
.
getType
();
orderService
.
updateStatus
(
orderDO
.
getOrderId
(),
null
,
null
,
null
,
null
,
null
,
auditType
,
OrderApprovalTypeResultEnum
.
expense_apply_processing
.
getDesc
());
orderService
.
updateStatus
(
orderDO
.
getOrderId
(),
null
,
null
,
null
,
null
,
null
,
auditType
,
OrderApprovalTypeResultEnum
.
expense_apply_processing
.
getDesc
());
updateObj
.
setBpmProcessId
(
bpmProcessId
);
updateObj
.
setBpmProcessId
(
String
.
valueOf
(
bpmProcessId
)
);
feeApplicationMapper
.
updateById
(
updateObj
);
feeApplicationMapper
.
updateById
(
updateObj
);
DictDataRespDTO
dictDataFromCacheOld
=
DictFrameworkUtils
.
getDictDataFromCache
(
DictTypeConstants
.
RECEIVABLE_FEE_TYPE
,
String
.
valueOf
(
orderFeeApplicationDOOld
.
getFeeType
()));
DictDataRespDTO
dictDataFromCacheOld
=
DictFrameworkUtils
.
getDictDataFromCache
(
DictTypeConstants
.
RECEIVABLE_FEE_TYPE
,
String
.
valueOf
(
orderFeeApplicationDOOld
.
getFeeType
()));
DictDataRespDTO
dictDataFromCache
=
DictFrameworkUtils
.
getDictDataFromCache
(
DictTypeConstants
.
RECEIVABLE_FEE_TYPE
,
String
.
valueOf
(
updateReqVO
.
getFeeType
()));
DictDataRespDTO
dictDataFromCache
=
DictFrameworkUtils
.
getDictDataFromCache
(
DictTypeConstants
.
RECEIVABLE_FEE_TYPE
,
String
.
valueOf
(
updateReqVO
.
getFeeType
()));
...
...
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