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
1
Merge Requests
1
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
ebc3a66b
Commit
ebc3a66b
authored
Feb 18, 2020
by
huangZW
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
111
parent
ff9aac4e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
1 deletions
+24
-1
StaffDTO.java
...src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java
+11
-1
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+13
-0
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java
View file @
ebc3a66b
...
...
@@ -42,9 +42,19 @@ public class StaffDTO implements Serializable{
private
List
<
DepartmentDTO
>
departmentList
;
private
String
bindFlag
;
private
static
final
long
serialVersionUID
=
1L
;
public
String
getStaffId
()
{
public
String
getBindFlag
()
{
return
bindFlag
;
}
public
void
setBindFlag
(
String
bindFlag
)
{
this
.
bindFlag
=
bindFlag
;
}
public
String
getStaffId
()
{
return
staffId
;
}
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
ebc3a66b
...
...
@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.controller;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -98,8 +99,20 @@ public class ClerkController extends WebBaseController{
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
List
<
StaffDepartmentRelatedDTO
>
list
=
staffDepartmentRelatedApiService
.
listByDepartmentId
(
departmentId
);
Map
<
String
,
StaffDepartmentRelatedDTO
>
relatedMap
=
com
.
gic
.
commons
.
util
.
CollectionUtil
.
toMap
(
list
,
"staffId"
);
List
<
String
>
staffIds
=
list
.
stream
().
map
(
s
->
s
.
getStaffId
()).
collect
(
Collectors
.
toList
());
List
<
StaffDTO
>
resultlist
=
staffApiService
.
listByIds
(
staffIds
);
for
(
StaffDTO
dto
:
resultlist
){
if
(
relatedMap
.
get
(
dto
.
getStaffId
())
!=
null
){
if
(
relatedMap
.
get
(
dto
.
getStaffId
()).
getClerkCode
()!=
null
){
dto
.
setBindFlag
(
"1"
);
}
else
{
dto
.
setBindFlag
(
"0"
);
}
}
else
{
dto
.
setBindFlag
(
"0"
);
}
}
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
resultlist
);
}
...
...
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