Skip to content

Y
yd-backend
Commit 24041475 by hongzhong
Options

ydlife 我的团队中数据查询(代码优化

parent 07d84765
Showing with 15 additions and 20 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
...@@ -816,11 +816,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -816,11 +816,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
if(StringUtils.isNotBlank(systemType)){ if(StringUtils.isNotBlank(systemType)){
if("S2".equals(systemType)){ if("S2".equals(systemType)){
if(null != s1DataList){ if(null != s1DataList){
for (TeamMemberDetail teamMemberDetail : s1DataList) { commFor(s1DataList, teamMemberList);
if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
teamMemberList.add(teamMemberDetail);
}
}
} }
//没有团队长 //没有团队长
getTeamMemberDetails(s1DataList,teamMemberList,"1"); getTeamMemberDetails(s1DataList,teamMemberList,"1");
...@@ -837,26 +833,16 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -837,26 +833,16 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
//根据职级进行数据筛选 //根据职级进行数据筛选
if (null != teamList && teamList.size() > 0) { if (null != teamList && teamList.size() > 0) {
if ("S2".equals(teamList.get(0).getPractitionerLevel())) { if ("S2".equals(teamList.get(0).getPractitionerLevel())) {
for (TeamMemberDetail teamMemberDetail : s1DataList) { //1获取当前经纪人所在的团队信息
if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) { commFor(s1DataList, teamMemberList);
teamMemberList.add(teamMemberDetail); //2当前团队没有团长，根据体系id去重，只显示一个组织
}
}
getTeamMemberDetails(s1DataList,teamMemberList,"1"); getTeamMemberDetails(s1DataList,teamMemberList,"1");
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) { commFor(s1DataList, teamMemberList);
if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
teamMemberList.add(teamMemberDetail);
}
}
getTeamMemberDetails(s1DataList,teamMemberList,"1"); getTeamMemberDetails(s1DataList,teamMemberList,"1");
for (TeamMemberDetail teamMemberDetail : s2DataList) {
if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
teamMemberList.add(teamMemberDetail);
}
}
commFor(s2DataList, teamMemberList);
getTeamMemberDetails(s2DataList,teamMemberList,"2"); getTeamMemberDetails(s2DataList,teamMemberList,"2");
groupList.addAll(s3DataList); groupList.addAll(s3DataList);
...@@ -897,6 +883,15 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -897,6 +883,15 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
return resp; return resp;
} }
//获取当前经纪人所在的团队信息
private void commFor(List<TeamMemberDetail> s1DataList, List<TeamMemberDetail> teamMemberList) {
for (TeamMemberDetail teamMemberDetail : s1DataList) {
if (null != teamMemberDetail.getOwnerPractitionerId() && teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()) {
teamMemberList.add(teamMemberDetail);
}
}
}
//没有团队长的组织 根据体系id去重，只显示一个组织 //没有团队长的组织 根据体系id去重，只显示一个组织
private void getTeamMemberDetails(List<TeamMemberDetail> s1DataList,List<TeamMemberDetail> teamMemberList,String flag) { private void getTeamMemberDetails(List<TeamMemberDetail> s1DataList,List<TeamMemberDetail> teamMemberList,String flag) {
if(teamMemberList == null || teamMemberList.size() == 0 || "2".equals(flag)){ if(teamMemberList == null || teamMemberList.size() == 0 || "2".equals(flag)){
......
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