ydlife 我的团队中数据查询

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

@@ -70,6 +70,7 @@ import com.yd.rmi.n22.staff.pojo.Staff;
 import com.yd.rmi.n22.staff.service.N22StaffService;
 import com.yd.util.CommonUtil;
 import com.yd.util.config.ZHBErrorConfig;
+import org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
@@ -751,11 +752,64 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         try {
             // 获取团队成员或被辅导人的practitionerId
             List<Long> practitionerIdList = practitionerService.getPractitionerIdList(practitionerId,1);
-
             List<TeamMemberDetail> dataList = aclPractitionerDALService.queryTeamMemberDetailList(practitionerIdList);
 
+            List<TeamMemberDetail> s1DataList = new ArrayList<>();
+            List<TeamMemberDetail> s2DataList = new ArrayList<>();
+            List<TeamMemberDetail> s3DataList = new ArrayList<>();
+
+            List<TeamMemberDetail> groupList  = new ArrayList<>();
+            List<TeamMemberDetail> teamList =  new ArrayList<>();
+            BeanPropertyValueEqualsPredicate predicatePackage;
+
+            //根据体系筛选出对应的经纪人信息
+            if(null != dataList){
+                for(TeamMemberDetail teamMemberDetail:dataList){
+                    if("S1".equals(teamMemberDetail.getSystemType())){
+                        s1DataList.add(teamMemberDetail);
+                    }
+                    if("S2".equals(teamMemberDetail.getSystemType())){
+                        s2DataList.add(teamMemberDetail);
+                    }
+                    if("S3".equals(teamMemberDetail.getSystemType())){
+                        s3DataList.add(teamMemberDetail);
+                    }
+                }
+            }
+            //查询当前的经纪人信息
+            predicatePackage = new BeanPropertyValueEqualsPredicate( "practitionerId", practitionerId);
+            teamList = (List<TeamMemberDetail>) CollectionUtils.select(dataList,predicatePackage);
+
+            //根据职级进行数据筛选
+            if(null != teamList){
+               if("S2".equals( teamList.get(0).getPractitionerLevel())){
+                   for(TeamMemberDetail teamMemberDetail:s1DataList) {
+                       if(teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()){
+                           groupList.add(teamMemberDetail);
+                       }
+                   }
+                   groupList.addAll(s2DataList);
+               }else if("S3".equals( teamList.get(0).getPractitionerLevel())){
+                   for(TeamMemberDetail teamMemberDetail:s1DataList) {
+                       if(teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()){
+                           groupList.add(teamMemberDetail);
+                       }
+                   }
+
+                   for(TeamMemberDetail teamMemberDetail:s2DataList) {
+                       if(teamMemberDetail.getOwnerPractitionerId().longValue() == teamMemberDetail.getPractitionerId().longValue()){
+                           groupList.add(teamMemberDetail);
+                       }
+                   }
+                   groupList.addAll(s3DataList);
+
+               }else if("S1".equals( teamList.get(0).getPractitionerLevel())){
+                   groupList.addAll(dataList);
+               }
+            }
+
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
-            resp.setTeamMemberDetail(dataList);
+            resp.setTeamMemberDetail(groupList);
 
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -23,4 +23,6 @@ public class TeamMemberDetail {
     private String idNo;
     private String effectiveStartDate;
     private String practitionerRegNo;
+    private Long ownerPractitionerId;
+    private String systemType;
 }

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

@@ -1606,14 +1606,19 @@
   </select>
 
   <select id="queryTeamAllPractitionerId" resultType="Long">
-      SELECT id from ag_acl_practitioner
+<!--      SELECT id from ag_acl_practitioner
           where is_active = 1
           and subordinate_system_id =
           (select subordinate_system_id from ag_acl_practitioner where id = #{practitionerId,jdbcType=BIGINT})
       <if test="isActive != null">
         and is_active = #{isActive,jdbcType=INTEGER}
-      </if>
-
+      </if>-->
+    select
+           t.id
+    from ag_acl_practitioner  t
+        LEFT JOIN ag_acl_practitioner_subordinate_system s ON t.s2_id = s.id or t.subordinate_system_id = s.id or t.s3_id = s.id
+    WHERE s.id in (select subordinate_system_id from ag_acl_practitioner where id = #{practitionerId,jdbcType=BIGINT})
+      and t.is_active=1;
   </select>
 
   <select id="findPractitionerInfoByPractitionerId" resultMap="practitioner_info_map">
@@ -1685,7 +1690,8 @@
           p.id_type,
           p.id_no,
           p.effective_start_date,
-          p.practitioner_reg_no
+          p.practitioner_reg_no,
+          sys.system_type as systemType,sys.owner_practitioner_id as ownerPractitionerId
       from
       (select
         id,name,mobile_no,gender,practitioner_birthdate,province_name,city_name,id_type,id_no,effective_start_date,
@@ -1827,4 +1833,4 @@
     where p.id = #{practitionerId}
   </select>
 
-</mapper>
\ No newline at end of file
+</mapper>