我的团队信息，战队业绩信息调整，显示育成人信息

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

@@ -2320,7 +2320,12 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             responseVO.setCommonResult(new CommonResult(false,ZHBErrorConfig.getErrorInfo("630028")));
             responseVO.setCommonResult(new CommonResult(false,ZHBErrorConfig.getErrorInfo("630028")));
             return responseVO;
             return responseVO;
         }
         }
-        List<AclPractitioner> practitioners = aclPractitionerDALService.findByIds(this.getPractitionerIdList(practitionerId,1));
+        List<Long> practitionerIdList = this.getPractitionerIdList(practitionerId,1);
+        AclPractitioner practitioner = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
+        if(null != practitioner && null != practitioner.getRaiseId()){
+            practitionerIdList.add(practitioner.getId());
+        }
+        List<AclPractitioner> practitioners = aclPractitionerDALService.findByIds(practitionerIdList);
         if (practitioners.isEmpty()){
         if (practitioners.isEmpty()){
             responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             return responseVO;
             return responseVO;
@@ -3049,7 +3054,12 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
      */
      */
     private void getMemberInfoForOnLine(Map<String,SubordinateSystemMemberInfo> memberInfoMap, Long practitionerId, Integer time) {
     private void getMemberInfoForOnLine(Map<String,SubordinateSystemMemberInfo> memberInfoMap, Long practitionerId, Integer time) {
         //1、查询该团队长所在体系的所有成员
         //1、查询该团队长所在体系的所有成员
-        List<AclPractitioner> practitionerList = aclPractitionerDALService.findByIds(this.getPractitionerIdList(practitionerId,null));
+        List<Long> practitionerIdList = this.getPractitionerIdList(practitionerId,null);
+        AclPractitioner practitionerRaise = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
+        if(null != practitionerRaise && null != practitionerRaise.getRaiseId()){
+            practitionerIdList.add(practitionerRaise.getId());
+        }
+        List<AclPractitioner> practitionerList = aclPractitionerDALService.findByIds(practitionerIdList);
         if(!practitionerList.isEmpty() && practitionerList.get(0) != null){
         if(!practitionerList.isEmpty() && practitionerList.get(0) != null){
             Map<Long,Long> customerMap = new HashMap<>();
             Map<Long,Long> customerMap = new HashMap<>();
             Map<Long,String> practitionerIdMobileNoMap = new HashMap<>();
             Map<Long,String> practitionerIdMobileNoMap = new HashMap<>();

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

@@ -5,6 +5,7 @@ import com.yd.api.practitioner.service.ScheduleTrackService;
 import com.yd.api.practitioner.vo.sechedule.*;
 import com.yd.api.practitioner.vo.sechedule.*;
 import com.yd.api.result.CommonResult;
 import com.yd.api.result.CommonResult;
 import com.yd.dal.entity.customer.AclCustomer;
 import com.yd.dal.entity.customer.AclCustomer;
+import com.yd.dal.entity.customer.AclPractitioner;
 import com.yd.dal.entity.customer.AclPractitionerPotential;
 import com.yd.dal.entity.customer.AclPractitionerPotential;
 import com.yd.dal.entity.customer.AclPractitionerPotentialAssignedTrack;
 import com.yd.dal.entity.customer.AclPractitionerPotentialAssignedTrack;
 import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;
 import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;
@@ -316,6 +317,10 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
 
 
             // 获取团队成员或被辅导人的practitionerId
             // 获取团队成员或被辅导人的practitionerId
             List<Long> practitionerIdList = practitionerService.getPractitionerIdList(practitionerId,null);
             List<Long> practitionerIdList = practitionerService.getPractitionerIdList(practitionerId,null);
+            AclPractitioner practitioner = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
+            if(null != practitioner && null != practitioner.getRaiseId()){
+                practitionerIdList.add(practitioner.getId());
+            }
 
 
             // 根据团队长经纪人id查询团队每个成员本日，本周，本月得分以及---线上本月FYC
             // 根据团队长经纪人id查询团队每个成员本日，本周，本月得分以及---线上本月FYC
             List<PersonalPEPScore> saleAndRecuit = scheduleTrackMapper.querySaleRecuitScoreFYC(practitionerIdList);
             List<PersonalPEPScore> saleAndRecuit = scheduleTrackMapper.querySaleRecuitScoreFYC(practitionerIdList);

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerMapper.java

@@ -90,4 +90,5 @@ public interface AclPractitionerMapper {
     List<PayScaleInfo> queryEGHistorySalaryPDFByPractitionerId(Long practitionerId);
     List<PayScaleInfo> queryEGHistorySalaryPDFByPractitionerId(Long practitionerId);
 
 
     public List<TeamMemberDetail> queryTeamMemberDetailRaiseList(List<Long> practitionerIdList);
     public List<TeamMemberDetail> queryTeamMemberDetailRaiseList(List<Long> practitionerIdList);
+    public AclPractitioner findPractitionerByRaise(Long practitionerId);
     }
     }

yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerDALService.java

@@ -216,5 +216,10 @@ public interface AclPractitionerDALService {
      */
      */
     List<AclCustomer> getAclCustomers(Long practitionerId,Long flag);
     List<AclCustomer> getAclCustomers(Long practitionerId,Long flag);
     List<TeamMemberDetail> queryTeamMemberDetailRaiseList(List<Long> practitionerIdList);
     List<TeamMemberDetail> queryTeamMemberDetailRaiseList(List<Long> practitionerIdList);
-
+    /**
+     * 通过经纪人id查找经纪人
+     * @param practitionerId
+     * @return
+     */
+    AclPractitioner findPractitionerByRaise(Long practitionerId);
 }
 }

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerDALServiceImpl.java

@@ -312,4 +312,9 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
     public List<TeamMemberDetail> queryTeamMemberDetailRaiseList(List<Long> practitionerIdList) {
     public List<TeamMemberDetail> queryTeamMemberDetailRaiseList(List<Long> practitionerIdList) {
         return aclPractitionerMapper.queryTeamMemberDetailRaiseList(practitionerIdList);
         return aclPractitionerMapper.queryTeamMemberDetailRaiseList(practitionerIdList);
     }
     }
+
+    @Override
+    public AclPractitioner findPractitionerByRaise(Long practitionerId) {
+        return aclPractitionerMapper.findPractitionerByRaise(practitionerId);
+    }
 }
 }

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

@@ -1910,4 +1910,11 @@
     left join (select * from ag_md_code where code_type = 'EducationLevel') c on p.education_level = c.code_code
     left join (select * from ag_md_code where code_type = 'EducationLevel') c on p.education_level = c.code_code
   </select>
   </select>
 
 
+  <select id="findPractitionerByRaise" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select
+    <include refid="Base_Column_List" />
+    from ag_acl_practitioner
+    where raise_id = #{practitionerId,jdbcType=BIGINT}
+  </select>
 </mapper>
 </mapper>