Skip to content

Y
yd-backend
Commit c01acb92 by hongzhong
Options

ydlife 我的团队中数据查询07

parent 0d7ff03c
Showing with 13 additions and 9 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
...@@ -844,9 +844,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -844,9 +844,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
teamMemberList.add(teamMemberDetail); teamMemberList.add(teamMemberDetail);
} }
} }
if(teamMemberList == null || teamMemberList.size() == 0){ getTeamMemberDetails(s1DataList,teamMemberList,"1");
teamMemberList.addAll(s1DataList);
}
groupList.addAll(s2DataList); groupList.addAll(s2DataList);
} else if ("S3".equals(teamList.get(0).getPractitionerLevel())) { } else if ("S3".equals(teamList.get(0).getPractitionerLevel())) {
for (TeamMemberDetail teamMemberDetail : s1DataList) { for (TeamMemberDetail teamMemberDetail : s1DataList) {
...@@ -854,17 +852,14 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -854,17 +852,14 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
teamMemberList.add(teamMemberDetail); teamMemberList.add(teamMemberDetail);
} }
} }
if(teamMemberList == null || teamMemberList.size() == 0){ getTeamMemberDetails(s1DataList,teamMemberList,"1");
teamMemberList.addAll(s1DataList);
}
for (TeamMemberDetail teamMemberDetail : s2DataList) { for (TeamMemberDetail teamMemberDetail : s2DataList) {
if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) { if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
teamMemberList.add(teamMemberDetail); teamMemberList.add(teamMemberDetail);
} }
} }
if(teamMemberList == null || teamMemberList.size() == 0){
teamMemberList.addAll(s2DataList); getTeamMemberDetails(s2DataList,teamMemberList,"2");
}
groupList.addAll(s3DataList); groupList.addAll(s3DataList);
} else if ("S1".equals(teamList.get(0).getPractitionerLevel())) { } else if ("S1".equals(teamList.get(0).getPractitionerLevel())) {
...@@ -903,6 +898,15 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -903,6 +898,15 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
return resp; return resp;
} }
private void getTeamMemberDetails(List<TeamMemberDetail> s1DataList,List<TeamMemberDetail> teamMemberList,String flag) {
if(teamMemberList == null || teamMemberList.size() == 0 || "2".equals(flag)){
List<TeamMemberDetail> list = s1DataList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
() -> new TreeSet<>(Comparator.comparing(TeamMemberDetail::getSId))), ArrayList::new));
teamMemberList.addAll(list);
}
}
@Override @Override
public QuerySalaryDetailResponseVO querySalaryDetail(QuerySalaryDetailRequestVO requestVO) { public QuerySalaryDetailResponseVO querySalaryDetail(QuerySalaryDetailRequestVO requestVO) {
QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO(); QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment