Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
midjourney-proxy
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
徐少华
midjourney-proxy
Commits
2a643729
Commit
2a643729
authored
Sep 22, 2020
by
桂前礼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug: [1025712] 书刊管理-编辑添加书刊出版社和运营平台取反了,导出的表格没有出版社信息
parent
3034a073
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
10 deletions
+20
-10
BookBizImpl.java
.../main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
+2
-2
BookSet.java
...-book/src/main/java/com/pcloud/book/book/set/BookSet.java
+18
-8
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
View file @
2a643729
...
@@ -1380,9 +1380,9 @@ public class BookBizImpl implements BookBiz {
...
@@ -1380,9 +1380,9 @@ public class BookBizImpl implements BookBiz {
bookSet
.
setTemplateNameNew
(
pageBean
.
getRecordList
());
bookSet
.
setTemplateNameNew
(
pageBean
.
getRecordList
());
// 设置运营平台名称
// 设置运营平台名称
bookSet
.
setChannelInfoList
(
pageBean
.
getRecordList
());
bookSet
.
setChannelInfoList
(
pageBean
.
getRecordList
());
// 设置出版社名称
// 设置出版社名称
避免循环调接口
bookSet
.
setAgentId4BookDto
(
pageBean
.
getRecordList
());
bookSet
.
setAgentId4BookDto
(
pageBean
.
getRecordList
());
bookSet
.
setAgentName4BookDto
(
pageBean
.
getRecordList
());
//
bookSet.setAgentName4BookDto(pageBean.getRecordList());
// 设置图书收益
// 设置图书收益
bookSet
.
setBookIncome
(
pageBean
.
getRecordList
());
bookSet
.
setBookIncome
(
pageBean
.
getRecordList
());
// 设置编辑账户信息
// 设置编辑账户信息
...
...
pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java
View file @
2a643729
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
*/
*/
package
com
.
pcloud
.
book
.
book
.
set
;
package
com
.
pcloud
.
book
.
book
.
set
;
import
cn.hutool.core.collection.CollUtil
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
...
@@ -304,12 +305,21 @@ public class BookSet {
...
@@ -304,12 +305,21 @@ public class BookSet {
* 批量填充出版ID
* 批量填充出版ID
*/
*/
public
void
setAgentId4BookDto
(
List
<
Object
>
objects
)
{
public
void
setAgentId4BookDto
(
List
<
Object
>
objects
)
{
for
(
Object
object
:
objects
)
{
if
(
CollUtil
.
isEmpty
(
objects
))
{
BookDto
bookDto
=
(
BookDto
)
object
;
return
;
Long
adviserId
=
bookDto
.
getAdviserId
();
}
if
(
null
!=
adviserId
)
{
List
<
Long
>
adviserIds
=
objects
.
stream
().
map
(
x
->
((
BookDto
)
x
).
getAdviserId
()).
collect
(
Collectors
.
toList
());
Long
agentId
=
adviserConsr
.
getAgentIdByAdviser
(
adviserId
);
if
(
CollUtil
.
isNotEmpty
(
adviserIds
))
{
bookDto
.
setAgentId
(
agentId
);
Map
<
Long
,
AdviserBaseInfoDto
>
map
=
adviserConsr
.
getAdviserId2AdviserInfoDtoMap
(
adviserIds
);
if
(
CollUtil
.
isNotEmpty
(
map
))
{
objects
.
forEach
(
x
->
{
BookDto
x1
=
(
BookDto
)
x
;
AdviserBaseInfoDto
dto
=
map
.
get
(
x1
.
getAdviserId
());
if
(
Objects
.
nonNull
(
dto
))
{
x1
.
setAgentId
(
dto
.
getAgentId
());
x1
.
setAgentName
(
dto
.
getAgentName
());
}
});
}
}
}
}
}
}
...
@@ -1528,8 +1538,8 @@ public class BookSet {
...
@@ -1528,8 +1538,8 @@ public class BookSet {
objs
[
4
]
=
((
bookDto
.
getAdviserName
()
==
null
||
""
.
equals
(
bookDto
.
getAdviserName
().
trim
()))
?
"-"
objs
[
4
]
=
((
bookDto
.
getAdviserName
()
==
null
||
""
.
equals
(
bookDto
.
getAdviserName
().
trim
()))
?
"-"
:
bookDto
.
getAdviserName
());
:
bookDto
.
getAdviserName
());
// 出版社
// 出版社
objs
[
5
]
=
((
bookDto
.
get
Publish
()
==
null
||
""
.
equals
(
bookDto
.
getPublish
().
trim
()))
?
"-"
objs
[
5
]
=
((
bookDto
.
get
AgentName
()
==
null
||
""
.
equals
(
bookDto
.
getAgentName
().
trim
()))
?
"-"
:
bookDto
.
get
Publish
());
:
bookDto
.
get
AgentName
());
// 添加时间
// 添加时间
objs
[
6
]
=
bookDto
.
getCreatedDate
()
==
null
?
"-"
objs
[
6
]
=
bookDto
.
getCreatedDate
()
==
null
?
"-"
:
DateUtils
.
getStrFormTime
(
"yyyy/M/d H:m"
,
bookDto
.
getCreatedDate
());
:
DateUtils
.
getStrFormTime
(
"yyyy/M/d H:m"
,
bookDto
.
getCreatedDate
());
...
...
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