Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-csf
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xingmin
yd-csf
Commits
d2d8dab1
Commit
d2d8dab1
authored
Mar 04, 2026
by
zhangxingmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
push
parent
1a5f41e9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java
+6
-4
No files found.
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java
View file @
d2d8dab1
...
@@ -280,9 +280,9 @@ public class ApiCommissionExpectedController {
...
@@ -280,9 +280,9 @@ public class ApiCommissionExpectedController {
if
(!
CollectionUtils
.
isEmpty
(
allExpectedIdList
))
{
if
(!
CollectionUtils
.
isEmpty
(
allExpectedIdList
))
{
receivableReportPage
=
commissionExpectedService
.
receivableReportPage
(
reportPage
,
allExpectedIdList
);
receivableReportPage
=
commissionExpectedService
.
receivableReportPage
(
reportPage
,
allExpectedIdList
);
}
}
log
.
info
(
"receivableReportPage>>>>前{}"
,
JSON
.
toJSONString
(
receivableReportPage
));
enrichReceivableReportWithCompanyName
(
receivableReportPage
);
enrichReceivableReportWithCompanyName
(
receivableReportPage
);
log
.
info
(
"receivableReportPage>>>>{}"
,
JSON
.
toJSONString
(
receivableReportPage
));
log
.
info
(
"receivableReportPage>>>>
后
{}"
,
JSON
.
toJSONString
(
receivableReportPage
));
// 组装返回结果
// 组装返回结果
ReceivableReportResponse
response
=
new
ReceivableReportResponse
();
ReceivableReportResponse
response
=
new
ReceivableReportResponse
();
response
.
setStatisticsVO
(
statisticsVO
);
response
.
setStatisticsVO
(
statisticsVO
);
...
@@ -301,7 +301,7 @@ public class ApiCommissionExpectedController {
...
@@ -301,7 +301,7 @@ public class ApiCommissionExpectedController {
.
filter
(
StringUtils:
:
isNotBlank
)
.
filter
(
StringUtils:
:
isNotBlank
)
.
distinct
()
.
distinct
()
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
log
.
info
(
"bizIdList>>>>{}"
,
JSON
.
toJSONString
(
bizIdList
));
if
(
bizIdList
.
isEmpty
())
{
if
(
bizIdList
.
isEmpty
())
{
return
;
return
;
}
}
...
@@ -314,6 +314,7 @@ public class ApiCommissionExpectedController {
...
@@ -314,6 +314,7 @@ public class ApiCommissionExpectedController {
Result
result
=
companyFeignClient
.
page
(
request
);
Result
result
=
companyFeignClient
.
page
(
request
);
List
<
ApiInsuranceReconciliationCompanyPageResponse
>
companyList
=
extractCompanyListFromResult
(
result
);
List
<
ApiInsuranceReconciliationCompanyPageResponse
>
companyList
=
extractCompanyListFromResult
(
result
);
log
.
info
(
"companyList>>>>{}"
,
JSON
.
toJSONString
(
companyList
));
if
(
companyList
.
isEmpty
())
{
if
(
companyList
.
isEmpty
())
{
return
;
return
;
}
}
...
@@ -326,7 +327,7 @@ public class ApiCommissionExpectedController {
...
@@ -326,7 +327,7 @@ public class ApiCommissionExpectedController {
ApiInsuranceReconciliationCompanyPageResponse:
:
getName
,
ApiInsuranceReconciliationCompanyPageResponse:
:
getName
,
(
v1
,
v2
)
->
v1
// 重复时保留第一个
(
v1
,
v2
)
->
v1
// 重复时保留第一个
));
));
log
.
info
(
"nameMap>>>>{}"
,
JSON
.
toJSONString
(
nameMap
));
// 回填名称
// 回填名称
page
.
getRecords
().
forEach
(
vo
->
{
page
.
getRecords
().
forEach
(
vo
->
{
if
(
StringUtils
.
isNotBlank
(
vo
.
getReconciliationCompanyBizId
()))
{
if
(
StringUtils
.
isNotBlank
(
vo
.
getReconciliationCompanyBizId
()))
{
...
@@ -346,6 +347,7 @@ public class ApiCommissionExpectedController {
...
@@ -346,6 +347,7 @@ public class ApiCommissionExpectedController {
if
(
result
==
null
||
result
.
getCode
()
!=
200
||
result
.
getData
()
==
null
)
{
if
(
result
==
null
||
result
.
getCode
()
!=
200
||
result
.
getData
()
==
null
)
{
return
Collections
.
emptyList
();
return
Collections
.
emptyList
();
}
}
log
.
info
(
"nameMap>>>>{}"
,
JSON
.
toJSONString
(
result
));
Object
data
=
result
.
getData
();
Object
data
=
result
.
getData
();
if
(!(
data
instanceof
IPage
<?>))
{
if
(!(
data
instanceof
IPage
<?>))
{
// 可根据需要记录日志
// 可根据需要记录日志
...
...
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