ydlife 我的团队中数据查询06

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -778,6 +778,27 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             //根据体系筛选出对应的经纪人信息,根据getSystemType分组
             if(null != dataList && dataList.size() > 0){
                 for(TeamMemberDetail teamMemberDetail:dataList){
+                    StringBuilder sb = new StringBuilder();
+                    if(StringUtils.isNotBlank(teamMemberDetail.getBranch())){
+                        sb.append(teamMemberDetail.getBranch());
+                    }
+                    if(StringUtils.isNotBlank(teamMemberDetail.getDeptName())){
+                        sb.append("-");
+                        sb.append(teamMemberDetail.getDeptName());
+                    }
+                    if(StringUtils.isNotBlank(teamMemberDetail.getS3system())){
+                        sb.append("-");
+                        sb.append(teamMemberDetail.getS3system());
+                    }
+                    if(StringUtils.isNotBlank(teamMemberDetail.getS2system())){
+                        sb.append("-");
+                        sb.append(teamMemberDetail.getS2system());
+                    }
+                    if(StringUtils.isNotBlank(teamMemberDetail.getS1system())){
+                        sb.append("-");
+                        sb.append(teamMemberDetail.getS1system());
+                    }
+                    teamMemberDetail.setAllSystemName(sb.toString());
                     if("S1".equals(teamMemberDetail.getSystemType())){
                         s1DataList.add(teamMemberDetail);
                     }
@@ -858,6 +879,20 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             }
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             teamMemberList = teamMemberList.stream().distinct().collect(Collectors.toList());
+            //排序
+            teamMemberList.sort(Comparator.comparing(TeamMemberDetail::getSystemType).reversed());
+            Collections.sort(groupList,new Comparator<TeamMemberDetail>() {
+                @Override
+                public int compare(TeamMemberDetail o1, TeamMemberDetail o2) {
+                    if(o2.getPractitionerLevel() == null){
+                       return  -1;
+                    }
+                    if(o1.getPractitionerLevel() == null){
+                        return  -1;
+                    }
+                    return (o2.getPractitionerLevel()).toString().compareTo(o1.getPractitionerLevel().toString());
+                }
+            });
             resp.setTeamMemberDetail(groupList);
             resp.setTeamMemberList(teamMemberList);
 

yd-api/src/main/java/com/yd/api/practitioner/vo/subordinate/TeamMemberDetail.java

@@ -26,5 +26,12 @@ public class TeamMemberDetail {
     private Long ownerPractitionerId;
     private String systemType;
     private Long sId;
+    private String s1system;
+    private String s2system;
+    private String s3system;
+    private String deptName;
+    private String allSystemName;
+
+
 
 }

yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml

@@ -1685,7 +1685,11 @@
           s.drop_option_code practitionerLevel,
           s.drop_option_name practitionerTitle,
           b.branch_name,
+          c.name deptName,
           sys.name system,
+          (select name from ag_acl_practitioner_subordinate_system s where s.id=p.s1_id) s1system,
+          (select name from ag_acl_practitioner_subordinate_system s where s.id=p.s2_id) s2system,
+          (select name from ag_acl_practitioner_subordinate_system s where s.id=p.s3_id) s3system,
           p1.name mentor,
           p2.name introducer,
           case when p.gender=1 then '男' else '女' end gender,
@@ -1704,7 +1708,7 @@
       from
       (select
         id,name,mobile_no,gender,practitioner_birthdate,province_name,city_name,id_type,id_no,effective_start_date,
-        subordinate_system_id,insurer_branch_id,mentor_id,introducer_id,practitioner_reg_no,education_level
+        subordinate_system_id,insurer_branch_id,mentor_id,introducer_id,practitioner_reg_no,education_level,s1_id,s3_id,s2_id,dept_id
         from ag_acl_practitioner
         where id in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
@@ -1717,6 +1721,7 @@
           from ag_acl_practitioner_setting t1 left join ag_md_drop_options o on t1.practitioner_level = o.id
       )s on p.id = s.practitioner_id
       left join ag_acl_insurer_branch b on p.insurer_branch_id = b.id
+      left join ag_acl_insurer_branch_dept c on p.dept_id = c.id
       left join ag_acl_practitioner p1 on p.mentor_id = p1.id
       left join ag_acl_practitioner p2 on p.introducer_id = p2.id
       left join (select * from ag_md_code where code_type = 'EducationLevel') c on p.education_level = c.code_code