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
2f467ab3
Commit
2f467ab3
authored
Nov 14, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
批量费用申请审批详情展示内容做筛选,只返回新增审批和修改审批内容,其他未做改变的内容不展示
parent
00452373
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
OrderFeeApplicationServiceImpl.java
...er/service/order/impl/OrderFeeApplicationServiceImpl.java
+2
-1
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 @
2f467ab3
...
@@ -55,6 +55,7 @@ import java.util.ArrayList;
...
@@ -55,6 +55,7 @@ import java.util.ArrayList;
import
java.util.Collection
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.Objects
;
import
java.util.stream.Collectors
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
exception
.
util
.
ServiceExceptionUtil
.
exception
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
exception
.
util
.
ServiceExceptionUtil
.
exception
;
import
static
cn
.
iocoder
.
yudao
.
module
.
order
.
enums
.
ErrorCodeConstants
.*;
import
static
cn
.
iocoder
.
yudao
.
module
.
order
.
enums
.
ErrorCodeConstants
.*;
...
@@ -661,7 +662,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
...
@@ -661,7 +662,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
OrderApprovalDO
orderApprovalDO
=
orderApprovalService
.
getApproval
(
Long
.
valueOf
(
processId
));
OrderApprovalDO
orderApprovalDO
=
orderApprovalService
.
getApproval
(
Long
.
valueOf
(
processId
));
if
(
Objects
.
nonNull
(
orderApprovalDO
)
&&
orderApprovalDO
.
getType
()
==
41
&&
StringUtils
.
isNotBlank
(
orderApprovalDO
.
getDetails
()))
{
if
(
Objects
.
nonNull
(
orderApprovalDO
)
&&
orderApprovalDO
.
getType
()
==
41
&&
StringUtils
.
isNotBlank
(
orderApprovalDO
.
getDetails
()))
{
List
<
OrderFeeApplicationDO
>
orderFeeApplicationDOList
=
JSONObject
.
parseArray
(
orderApprovalDO
.
getDetails
(),
OrderFeeApplicationDO
.
class
);
List
<
OrderFeeApplicationDO
>
orderFeeApplicationDOList
=
JSONObject
.
parseArray
(
orderApprovalDO
.
getDetails
(),
OrderFeeApplicationDO
.
class
);
return
OrderFeeApplicationConvert
.
INSTANCE
.
convertList
(
orderFeeApplicationDOList
);
return
OrderFeeApplicationConvert
.
INSTANCE
.
convertList
(
orderFeeApplicationDOList
.
stream
().
filter
(
fee
->
Objects
.
isNull
(
fee
.
getId
())
||
fee
.
isEditMode
()).
collect
(
Collectors
.
toList
())
);
}
else
{
}
else
{
List
<
OrderFeeApplicationDO
>
orderFeeApplicationDOList
=
feeApplicationMapper
.
selectList
(
OrderFeeApplicationDO:
:
getBatchBpmBusinessId
,
processId
);
List
<
OrderFeeApplicationDO
>
orderFeeApplicationDOList
=
feeApplicationMapper
.
selectList
(
OrderFeeApplicationDO:
:
getBatchBpmBusinessId
,
processId
);
return
OrderFeeApplicationConvert
.
INSTANCE
.
convertList
(
orderFeeApplicationDOList
);
return
OrderFeeApplicationConvert
.
INSTANCE
.
convertList
(
orderFeeApplicationDOList
);
...
...
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