Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
haoban3.0
haoban-manage3.0
Commits
aa790837
Commit
aa790837
authored
Aug 04, 2021
by
fudahua
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/developer' into developer
parents
a17d9005
29746297
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
StaffClerkRelationApiServiceImpl.java
...ce/service/out/impl/StaffClerkRelationApiServiceImpl.java
+6
-7
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java
View file @
aa790837
...
...
@@ -139,15 +139,12 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
}
List
<
StaffClerkInfoDTO
>
infoDTOS
=
EntityUtil
.
changeEntityListByJSON
(
StaffClerkInfoDTO
.
class
,
list
);
Map
<
String
,
String
>
nameMap
=
new
HashMap
<>();
logger
.
info
(
"测试========================================"
);
infoDTOS
.
forEach
(
infoDTO
->
{
//企业
if
(!
nameMap
.
containsKey
(
infoDTO
.
getEnterpriseId
()))
{
EnterpriseDTO
enterpriseDTO
=
enterpriseService
.
getEnterpriseById
(
infoDTO
.
getEnterpriseId
());
if
(
null
!=
enterpriseDTO
)
{
nameMap
.
put
(
infoDTO
.
getEnterpriseId
(),
enterpriseDTO
.
getBrandName
()+
"_"
+
enterpriseDTO
.
getEnterpriseName
());
logger
.
info
(
enterpriseDTO
.
getEnterpriseName
());
logger
.
info
(
enterpriseDTO
.
getBrandName
());
nameMap
.
put
(
infoDTO
.
getEnterpriseId
(),
enterpriseDTO
.
getEnterpriseName
()+
"_"
+
enterpriseDTO
.
getBrandName
());
}
else
{
nameMap
.
put
(
infoDTO
.
getEnterpriseId
(),
"未知商户"
);
}
...
...
@@ -176,11 +173,13 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
infoDTO
.
setClerkName
(
nameMap
.
get
(
infoDTO
.
getClerkId
()));
infoDTO
.
setStoreName
(
nameMap
.
get
(
infoDTO
.
getStoreId
()));
if
(
nameMap
.
get
(
infoDTO
.
getEnterpriseName
(
))!=
null
){
String
EnterpriseandBrandName
=
nameMap
.
get
(
infoDTO
.
getEnterprise
Name
());
if
(
(
nameMap
.
get
(
infoDTO
.
getEnterpriseId
()
))!=
null
){
String
EnterpriseandBrandName
=
nameMap
.
get
(
infoDTO
.
getEnterprise
Id
());
String
split
[]=
EnterpriseandBrandName
.
split
(
"_"
);
infoDTO
.
setEnterpriseName
(
split
[
0
]);
if
(
split
[
1
]!=
null
)
infoDTO
.
setBrandName
(
split
[
1
]);
if
(
split
[
1
]!=
null
){
infoDTO
.
setBrandName
(
split
[
1
]);
}
}
// infoDTO.setEnterpriseName(nameMap.get(infoDTO.getEnterpriseId()));
});
...
...
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