Skip to content

Y
yd-backend
Commit f3751282 by jianan
Options

Merge remote-tracking branch 'origin/dev' into dev

parents ea26131b 0cdae0d8
Showing with 186 additions and 48 deletions
yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java
...@@ -3,6 +3,7 @@ package com.yd.api.practitioner; ...@@ -3,6 +3,7 @@ package com.yd.api.practitioner;
import com.yd.api.practitioner.service.PractitionerBasicInfoService; import com.yd.api.practitioner.service.PractitionerBasicInfoService;
import com.yd.api.practitioner.service.PractitionerService; import com.yd.api.practitioner.service.PractitionerService;
import com.yd.api.practitioner.service.ScheduleTrackService; import com.yd.api.practitioner.service.ScheduleTrackService;
import com.yd.api.practitioner.vo.login.CanSeeSalaryListResponseVO;
import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO; import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO;
import com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO; import com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO;
import com.yd.api.practitioner.vo.media.MediaGetReqVO; import com.yd.api.practitioner.vo.media.MediaGetReqVO;
...@@ -600,4 +601,16 @@ public class PractitionerController { ...@@ -600,4 +601,16 @@ public class PractitionerController {
return result; return result;
} }
/**
* 查询经纪人是否可以看薪资表
* @return
*/
@RequestMapping("/canSeeSalaryList/{practitionerId}")
public Object canSeeSalaryList(@PathVariable Long practitionerId){
JsonResult result = new JsonResult();
CanSeeSalaryListResponseVO responseVO = practitionerService.canSeeSalaryList(practitionerId);
result.addResult(responseVO);
result.setData(responseVO);
return result;
}
} }
yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerService.java
package com.yd.api.practitioner.service; package com.yd.api.practitioner.service;
import com.yd.api.practitioner.vo.login.CanSeeSalaryListResponseVO;
import com.yd.api.practitioner.vo.recruit.PotentialGoalsActionsUpdateResponseVO; import com.yd.api.practitioner.vo.recruit.PotentialGoalsActionsUpdateResponseVO;
import com.yd.api.practitioner.vo.recruit.PotentialGoalsQueryResponseVO; import com.yd.api.practitioner.vo.recruit.PotentialGoalsQueryResponseVO;
import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO; import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO;
...@@ -224,5 +225,11 @@ public interface PractitionerService { ...@@ -224,5 +225,11 @@ public interface PractitionerService {
* @param practitionerId * @param practitionerId
* @return * @return
*/ */
List<Long> getPractitionerIdList(Long practitionerId); List<Long> getPractitionerIdList(Long practitionerId,Integer isActive);
/**
* 查询经纪人是否可以看薪资表
* @return
*/
CanSeeSalaryListResponseVO canSeeSalaryList(Long practitionerId);
} }
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
...@@ -279,7 +279,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -279,7 +279,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
Long practitionerId = requestVO.getPractitionerId(); Long practitionerId = requestVO.getPractitionerId();
try { try {
// 获取团队成员或被辅导人的practitionerId // 获取团队成员或被辅导人的practitionerId
List<Long> practitionerIdList = practitionerService.getPractitionerIdList(practitionerId); List<Long> practitionerIdList = practitionerService.getPractitionerIdList(practitionerId,1);
List<TeamMemberDetail> dataList = aclPractitionerDALService.queryTeamMemberDetailList(practitionerIdList); List<TeamMemberDetail> dataList = aclPractitionerDALService.queryTeamMemberDetailList(practitionerIdList);
......
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
...@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper; ...@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
import com.yd.api.customer.service.CustomerService; import com.yd.api.customer.service.CustomerService;
import com.yd.api.customer.vo.register.RegisterRequestVO; import com.yd.api.customer.vo.register.RegisterRequestVO;
import com.yd.api.customer.vo.register.RegisterResponseVO; import com.yd.api.customer.vo.register.RegisterResponseVO;
import com.yd.api.practitioner.vo.login.CanSeeSalaryListResponseVO;
import com.yd.api.practitioner.vo.recruit.PotentialGoalsActionsUpdateResponseVO; import com.yd.api.practitioner.vo.recruit.PotentialGoalsActionsUpdateResponseVO;
import com.yd.api.practitioner.vo.recruit.PotentialGoalsQueryResponseVO; import com.yd.api.practitioner.vo.recruit.PotentialGoalsQueryResponseVO;
import com.yd.api.practitioner.vo.login.PractitionerLoginBasicInfo; import com.yd.api.practitioner.vo.login.PractitionerLoginBasicInfo;
...@@ -216,6 +217,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -216,6 +217,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
responseVO.setPractitionerTypeId(practitionerType); responseVO.setPractitionerTypeId(practitionerType);
responseVO.setPractitionerBasicInfo(basicInfo); responseVO.setPractitionerBasicInfo(basicInfo);
responseVO.setLoginTimes(logTimes); responseVO.setLoginTimes(logTimes);
responseVO.setCanSeeSalaryList(practitionerInfo.getCanSeeSalaryList());
responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000"))); responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
// } // }
}else{ }else{
...@@ -1806,7 +1808,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -1806,7 +1808,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
TeamActionsAverageQueryResponseVO responseVO = new TeamActionsAverageQueryResponseVO(); TeamActionsAverageQueryResponseVO responseVO = new TeamActionsAverageQueryResponseVO();
Long practitionerId = requestVO.getPractitionerId(); Long practitionerId = requestVO.getPractitionerId();
//该团队长下团队所有经纪人信息 //该团队长下团队所有经纪人信息
List<Long> practitionerIds = this.getPractitionerIdList(practitionerId); List<Long> practitionerIds = this.getPractitionerIdList(practitionerId,1);
//团队经纪人个数 //团队经纪人个数
BigDecimal practitionerNum = BigDecimal.valueOf(practitionerIds.size()); BigDecimal practitionerNum = BigDecimal.valueOf(practitionerIds.size());
...@@ -1865,14 +1867,14 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -1865,14 +1867,14 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
} }
@Override @Override
public List<Long> getPractitionerIdList(Long practitionerId) { public List<Long> getPractitionerIdList(Long practitionerId,Integer isActive) {
List<Long> practitionerIdList = new ArrayList<>(); List<Long> practitionerIdList = new ArrayList<>();
practitionerIdList.add(practitionerId); practitionerIdList.add(practitionerId);
// 判断当前经纪人是否为团队长 // 判断当前经纪人是否为团队长
int count = aclPractitionerDALService.isTeamLeader(practitionerId); int count = aclPractitionerDALService.isTeamLeader(practitionerId);
if (count > 0) { if (count > 0) {
List<Long> practitionerIdList1 = aclPractitionerDALService.queryTeamAllPractitionerId(practitionerId); List<Long> practitionerIdList1 = aclPractitionerDALService.queryTeamAllPractitionerId(practitionerId,isActive);
practitionerIdList.addAll(practitionerIdList1); practitionerIdList.addAll(practitionerIdList1);
} else { } else {
List<Long> practitionerIdList2 = aclPractitionerDALService.queryMentoredByPractitionerId(practitionerId); List<Long> practitionerIdList2 = aclPractitionerDALService.queryMentoredByPractitionerId(practitionerId);
...@@ -1884,6 +1886,15 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -1884,6 +1886,15 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
} }
@Override @Override
public CanSeeSalaryListResponseVO canSeeSalaryList(Long practitionerId) {
CanSeeSalaryListResponseVO responseVO = new CanSeeSalaryListResponseVO();
AclPractitioner aclPractitioner = aclPractitionerDALService.findById(practitionerId);
responseVO.setCanSeeSalaryList(aclPractitioner.getCanSeeSalaryList());
responseVO.setCommonResult(new CommonResult(true,ZHBErrorConfig.getErrorInfo("800000")));
return responseVO;
}
@Override
public PotentialGoalsActionsQueryResponseVO potentialGoalsActionsQuery(PotentialGoalsActionsQueryRequestVO requestVO) { public PotentialGoalsActionsQueryResponseVO potentialGoalsActionsQuery(PotentialGoalsActionsQueryRequestVO requestVO) {
PotentialGoalsActionsQueryResponseVO responseVO = new PotentialGoalsActionsQueryResponseVO(); PotentialGoalsActionsQueryResponseVO responseVO = new PotentialGoalsActionsQueryResponseVO();
Long practitionerId = requestVO.getPractitionerId(); Long practitionerId = requestVO.getPractitionerId();
...@@ -1979,7 +1990,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -1979,7 +1990,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
List<SalesPerformanceForecastInfo> infos = new ArrayList<>(); List<SalesPerformanceForecastInfo> infos = new ArrayList<>();
//通过团队长经纪人id,查询此团队所有经纪人id //通过团队长经纪人id,查询此团队所有经纪人id
Long practitionerId = requestVO.getPractitionerId(); Long practitionerId = requestVO.getPractitionerId();
List<AclPractitioner> practitioners = aclPractitionerDALService.findByIds(this.getPractitionerIdList(practitionerId)); List<AclPractitioner> practitioners = aclPractitionerDALService.findByIds(this.getPractitionerIdList(practitionerId,1));
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;
...@@ -2398,6 +2409,15 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -2398,6 +2409,15 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
getMemberInfoForOnLine(memberInfoMap,practitionerId,time); getMemberInfoForOnLine(memberInfoMap,practitionerId,time);
//eGolden //eGolden
getMemberInfoForEGolden(memberInfoMap,practitionerId,time); getMemberInfoForEGolden(memberInfoMap,practitionerId,time);
//20210303增加逻辑,已离职经纪人没有数据不显示
//查询这个团队已离职经纪人电话
List<String> leaveOfficeList = aclPractitionerDALService.findLeaveOfficeByPractitionerId(practitionerId);
for (String m : leaveOfficeList) {
SubordinateSystemMemberInfo subordinateSystemMemberInfo = memberInfoMap.get(m);
if (CommonUtil.isNullOrZero(subordinateSystemMemberInfo.getCount())){
memberInfoMap.remove(m);
}
}
//查询出来的结果按照fyp进行排序 //查询出来的结果按照fyp进行排序
List<SubordinateSystemMemberInfo> memberInfoList = new ArrayList<>(memberInfoMap.values()); List<SubordinateSystemMemberInfo> memberInfoList = new ArrayList<>(memberInfoMap.values());
memberInfoList.sort(Comparator.comparingDouble(SubordinateSystemMemberInfo::getFyp)); memberInfoList.sort(Comparator.comparingDouble(SubordinateSystemMemberInfo::getFyp));
...@@ -2440,7 +2460,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -2440,7 +2460,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
* @param time * @param time
*/ */
private void getMemberInfoForEGolden(Map<String, SubordinateSystemMemberInfo> memberInfoMap, Long practitionerId, Integer time) { private void getMemberInfoForEGolden(Map<String, SubordinateSystemMemberInfo> memberInfoMap, Long practitionerId, Integer time) {
List<AclPractitioner> practitionerList = aclPractitionerDALService.findByIds(this.getPractitionerIdList(practitionerId)); List<AclPractitioner> practitionerList = aclPractitionerDALService.findByIds(this.getPractitionerIdList(practitionerId,null));
List<String> mobileNoList = new ArrayList<>(); List<String> mobileNoList = new ArrayList<>();
for(AclPractitioner item : practitionerList){ for(AclPractitioner item : practitionerList){
mobileNoList.add(item.getMobileNo()); mobileNoList.add(item.getMobileNo());
...@@ -2547,7 +2567,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -2547,7 +2567,7 @@ 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)); List<AclPractitioner> practitionerList = aclPractitionerDALService.findByIds(this.getPractitionerIdList(practitionerId,null));
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
...@@ -297,7 +297,7 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService { ...@@ -297,7 +297,7 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
Date weekOne = cal2.getTime(); Date weekOne = cal2.getTime();
// 获取团队成员或被辅导人的practitionerId // 获取团队成员或被辅导人的practitionerId
List<Long> practitionerIdList = practitionerService.getPractitionerIdList(practitionerId); List<Long> practitionerIdList = practitionerService.getPractitionerIdList(practitionerId,null);
// 根据团队长经纪人id查询团队每个成员本日，本周，本月得分以及---线上本月FYC // 根据团队长经纪人id查询团队每个成员本日，本周，本月得分以及---线上本月FYC
List<PersonalPEPScore> saleAndRecuit = scheduleTrackMapper.querySaleRecuitScoreFYC(practitionerIdList); List<PersonalPEPScore> saleAndRecuit = scheduleTrackMapper.querySaleRecuitScoreFYC(practitionerIdList);
......
yd-api/src/main/java/com/yd/api/practitioner/vo/login/CanSeeSalaryListResponseVO.java 0 → 100644
package com.yd.api.practitioner.vo.login;
import com.yd.api.result.CommonResult;
/**
* @author xxy
*/
public class CanSeeSalaryListResponseVO {
private Long canSeeSalaryList;
private CommonResult commonResult;
/**
* 获取
*
* @return the canSeeSalaryList
*/
public Long getCanSeeSalaryList() {
return this.canSeeSalaryList;
}
/**
* 设置
*
* @param canSeeSalaryList the to set
*/
public void setCanSeeSalaryList(Long canSeeSalaryList) {
this.canSeeSalaryList = canSeeSalaryList;
}
/**
* 获取
*
* @return the commonResult
*/
public CommonResult getCommonResult() {
return this.commonResult;
}
/**
* 设置
*
* @param commonResult the to set
*/
public void setCommonResult(CommonResult commonResult) {
this.commonResult = commonResult;
}
@Override
public String toString() {
return "CanSeeSalaryListResponseVO{" +
"canSeeSalaryList=" + canSeeSalaryList +
", commonResult=" + commonResult +
'}';
}
}
yd-api/src/main/java/com/yd/api/practitioner/vo/login/PractitionerLoginResponseVO.java
...@@ -10,6 +10,7 @@ public class PractitionerLoginResponseVO { ...@@ -10,6 +10,7 @@ public class PractitionerLoginResponseVO {
private String practitionerIdEG; private String practitionerIdEG;
private Integer loginTimes; private Integer loginTimes;
private String getOpenIdUrl; private String getOpenIdUrl;
private Long canSeeSalaryList;
private PractitionerLoginBasicInfo practitionerBasicInfo; private PractitionerLoginBasicInfo practitionerBasicInfo;
private CommonResult commonResult; private CommonResult commonResult;
...@@ -76,4 +77,12 @@ public class PractitionerLoginResponseVO { ...@@ -76,4 +77,12 @@ public class PractitionerLoginResponseVO {
public void setPractitionerTypeId(Long practitionerTypeId) { public void setPractitionerTypeId(Long practitionerTypeId) {
this.practitionerTypeId = practitionerTypeId; this.practitionerTypeId = practitionerTypeId;
} }
public Long getCanSeeSalaryList() {
return this.canSeeSalaryList;
}
public void setCanSeeSalaryList(Long canSeeSalaryList) {
this.canSeeSalaryList = canSeeSalaryList;
}
} }
yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitioner.java
package com.yd.dal.entity.customer; package com.yd.dal.entity.customer;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
/** /**
* ag_acl_practitioner * 从业人员执业证信息表
* @author
*/ */
@Data @Data
public class AclPractitioner implements Serializable { public class AclPractitioner {
private static final long serialVersionUID = 1L;
/** /**
* serial id * serial id
*/ */
...@@ -106,6 +105,11 @@ public class AclPractitioner implements Serializable { ...@@ -106,6 +105,11 @@ public class AclPractitioner implements Serializable {
private String employeeNo; private String employeeNo;
/** /**
* 员工合同编号
*/
private String contractNo;
/**
* 0=No, 1=Yes * 0=No, 1=Yes
*/ */
private Integer isActive; private Integer isActive;
...@@ -188,6 +192,11 @@ public class AclPractitioner implements Serializable { ...@@ -188,6 +192,11 @@ public class AclPractitioner implements Serializable {
private String educationLevel; private String educationLevel;
/** /**
* 毕业学校
*/
private String graduatedUniversity;
/**
* FK ag_acl_practitioner.id 辅导人 * FK ag_acl_practitioner.id 辅导人
*/ */
private Long mentorId; private Long mentorId;
...@@ -203,19 +212,22 @@ public class AclPractitioner implements Serializable { ...@@ -203,19 +212,22 @@ public class AclPractitioner implements Serializable {
private Integer gender; private Integer gender;
/** /**
* 经纪人合同号 * 经纪人通过最后一步审批后生成的电子合同
*/ */
private String contractNo; private String contractOssPath;
/** /**
* 经纪人PDF合同地址 * FK ag_acl_practitioner_hiring_basic_info.id
*/ */
private String contractOssPath; private Long hiringBasicInfoId;
/** /**
* 经纪人报聘信息表id * 能够登录dyd
*/ */
private Long hiringBasicInfoId; private Long canLoginDyd;
private static final long serialVersionUID = 1L; /**
* 能够查看薪资表
*/
private Long canSeeSalaryList;
} }
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/entity/customer/practitioner/PractitionerInfo.java
...@@ -13,6 +13,7 @@ public class PractitionerInfo { ...@@ -13,6 +13,7 @@ public class PractitionerInfo {
private String weChatId; private String weChatId;
private String qqId; private String qqId;
private String practitionerRegNo; private String practitionerRegNo;
private Long canSeeSalaryList;
public Long getCustomerId() { public Long getCustomerId() {
return customerId; return customerId;
...@@ -109,4 +110,12 @@ public class PractitionerInfo { ...@@ -109,4 +110,12 @@ public class PractitionerInfo {
public void setGender(Integer gender) { public void setGender(Integer gender) {
this.gender = gender; this.gender = gender;
} }
public Long getCanSeeSalaryList() {
return canSeeSalaryList;
}
public void setCanSeeSalaryList(Long canSeeSalaryList) {
this.canSeeSalaryList = canSeeSalaryList;
}
} }
yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerMapper.java
package com.yd.dal.mapper.customer; package com.yd.dal.mapper.customer;
import com.yd.api.practitioner.vo.payscale.PayScaleInfo; import com.yd.api.practitioner.vo.payscale.PayScaleInfo;import com.yd.api.practitioner.vo.subordinate.TeamMemberDetail;import com.yd.dal.entity.customer.AclPractitioner;
import com.yd.api.practitioner.vo.subordinate.TeamMemberDetail;
import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
import com.yd.dal.entity.customer.AclPractitioner;
import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;
import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;import com.yd.dal.entity.customer.practitioner.PractitionerInfo;import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;import org.apache.ibatis.annotations.Param;
public interface AclPractitionerMapper { public interface AclPractitionerMapper {
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
...@@ -26,43 +17,49 @@ public interface AclPractitionerMapper { ...@@ -26,43 +17,49 @@ public interface AclPractitionerMapper {
int updateByPrimaryKey(AclPractitioner record); int updateByPrimaryKey(AclPractitioner record);
int updateBatch(List<AclPractitioner> list);
int updateBatchSelective(List<AclPractitioner> list);
int batchInsert(@Param("list") List<AclPractitioner> list);
PractitionerBasicInfo getPractitionerInfoByMobileNoForOffline(String mobileNo); PractitionerBasicInfo getPractitionerInfoByMobileNoForOffline(String mobileNo);
List<PractitionerRankInfo> getPractitionerRankInfoForOffline(@Param("time") Integer time); List<PractitionerRankInfo> getPractitionerRankInfoForOffline(@Param("time") Integer time);
PractitionerBasicInfo getPractitionerInfoByMobileNoForOnline(String mobileNo); PractitionerBasicInfo getPractitionerInfoByMobileNoForOnline(String mobileNo);
List<PractitionerRankInfo> getPractitionerRankInfoForOnline(@Param("time")Integer time,@Param("practitionerTypeId")Long practitionerTypeId); List<PractitionerRankInfo> getPractitionerRankInfoForOnline(@Param("time") Integer time, @Param("practitionerTypeId") Long practitionerTypeId);
List<PractitionerRankInfo> getPractitionerRankInfoForSpecials(@Param("mobileSpecials") List<String> mobileSpecials, @Param("time")Integer time); List<PractitionerRankInfo> getPractitionerRankInfoForSpecials(@Param("mobileSpecials") List<String> mobileSpecials, @Param("time") Integer time);
PractitionerInfo findPractitionerInfoByLogin(@Param("mobileNo")String mobileNo); PractitionerInfo findPractitionerInfoByLogin(@Param("mobileNo") String mobileNo);
AclPractitioner findByCustomerIdIsActive(@Param("customerId") Long customerId, @Param("isActive")int isActive); AclPractitioner findByCustomerIdIsActive(@Param("customerId") Long customerId, @Param("isActive") int isActive);
List<OwnOpportunityInfo> ownOpportunityQuery(@Param("practitionerId")Long practitionerId); List<OwnOpportunityInfo> ownOpportunityQuery(@Param("practitionerId") Long practitionerId);
List<AclPractitioner> findByIds(@Param("practitionerIdList") List<Long> practitionerIdList); List<AclPractitioner> findByIds(@Param("practitionerIdList") List<Long> practitionerIdList);
List<AclPractitioner> findForSubordinateIdByPractitionerId(Long practitionerId); List<AclPractitioner> findForSubordinateIdByPractitionerId(Long practitionerId);
List<PlayerSalesActivityInfo> playerSalesActivityQuery(@Param("practitionerId") Long practitionerId,@Param("optionsId") Long optionsId); List<PlayerSalesActivityInfo> playerSalesActivityQuery(@Param("practitionerId") Long practitionerId, @Param("optionsId") Long optionsId);
List<AclPractitioner> findBySubordinateSystemId(@Param("subordinateSystemId")Long subordinateSystemId); List<AclPractitioner> findBySubordinateSystemId(@Param("subordinateSystemId") Long subordinateSystemId);
String findMobileNoByPractitionerId(@Param("practitionerId")Long practitionerId); String findMobileNoByPractitionerId(@Param("practitionerId") Long practitionerId);
PractitionerBasicInfo findByMobileNoE(@Param("mobileNo")String mobileNo); PractitionerBasicInfo findByMobileNoE(@Param("mobileNo") String mobileNo);
PractitionerRankInfo getPractitionerRankInfoByPractitionerIdEG(@Param("practitionerIdEG") String practitionerIdEG, @Param("time") Integer time); PractitionerRankInfo getPractitionerRankInfoByPractitionerIdEG(@Param("practitionerIdEG") String practitionerIdEG, @Param("time") Integer time);
PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(@Param("practitionerId")Long practitionerId, @Param("time")Integer time); PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(@Param("practitionerId") Long practitionerId, @Param("time") Integer time);
List<PayScaleInfo> findPayScaleByPractitionerEG(@Param("practitionerIdEG")String practitionerIdEG); List<PayScaleInfo> findPayScaleByPractitionerEG(@Param("practitionerIdEG") String practitionerIdEG);
PayScaleBasicInfo findFilePathByMonShId(@Param("monShId")Integer monShId); PayScaleBasicInfo findFilePathByMonShId(@Param("monShId") Integer monShId);
PractitionerBasicInfo findByIdEG(@Param("practitionerIdEG")String practitionerIdEG); PractitionerBasicInfo findByIdEG(@Param("practitionerIdEG") String practitionerIdEG);
AclPractitioner findPractitionerByLeadsAssignedId(Long leadsAssignedId); AclPractitioner findPractitionerByLeadsAssignedId(Long leadsAssignedId);
...@@ -70,7 +67,7 @@ public interface AclPractitionerMapper { ...@@ -70,7 +67,7 @@ public interface AclPractitionerMapper {
int isTeamLeader(Long practitionerId); int isTeamLeader(Long practitionerId);
List<Long> queryTeamAllPractitionerId(Long practitionerId); List<Long> queryTeamAllPractitionerId(@Param("practitionerId")Long practitionerId,@Param("isActive")Integer isActive);
List<Long> queryMentoredByPractitionerId(Long practitionerId); List<Long> queryMentoredByPractitionerId(Long practitionerId);
...@@ -80,4 +77,5 @@ public interface AclPractitionerMapper { ...@@ -80,4 +77,5 @@ public interface AclPractitionerMapper {
List<TeamMemberDetail> queryTeamMemberDetailList(List<Long> practitionerIdList); List<TeamMemberDetail> queryTeamMemberDetailList(List<Long> practitionerIdList);
List<String> findLeaveOfficeByPractitionerId(Long practitionerId);
} }
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerDALService.java
...@@ -179,7 +179,7 @@ public interface AclPractitionerDALService { ...@@ -179,7 +179,7 @@ public interface AclPractitionerDALService {
int isTeamLeader(Long practitionerId); int isTeamLeader(Long practitionerId);
List<Long> queryTeamAllPractitionerId(Long practitionerId); List<Long> queryTeamAllPractitionerId(Long practitionerId,Integer isActive);
List<Long> queryMentoredByPractitionerId(Long practitionerId); List<Long> queryMentoredByPractitionerId(Long practitionerId);
...@@ -188,4 +188,6 @@ public interface AclPractitionerDALService { ...@@ -188,4 +188,6 @@ public interface AclPractitionerDALService {
PractitionerInfo findPractitionerInfoByPractitionerId(Long practitionerId); PractitionerInfo findPractitionerInfoByPractitionerId(Long practitionerId);
List<TeamMemberDetail> queryTeamMemberDetailList(List<Long> practitionerIdList); List<TeamMemberDetail> queryTeamMemberDetailList(List<Long> practitionerIdList);
List<String> findLeaveOfficeByPractitionerId(Long practitionerId);
} }
yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerDALServiceImpl.java
...@@ -19,6 +19,7 @@ import org.apache.log4j.Logger; ...@@ -19,6 +19,7 @@ import org.apache.log4j.Logger;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Service("aclPractitionerDALService") @Service("aclPractitionerDALService")
public class AclPractitionerDALServiceImpl implements AclPractitionerDALService { public class AclPractitionerDALServiceImpl implements AclPractitionerDALService {
...@@ -173,8 +174,8 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService ...@@ -173,8 +174,8 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
} }
@Override @Override
public List<Long> queryTeamAllPractitionerId(Long practitionerId) { public List<Long> queryTeamAllPractitionerId(Long practitionerId,Integer isActive) {
return aclPractitionerMapper.queryTeamAllPractitionerId(practitionerId); return aclPractitionerMapper.queryTeamAllPractitionerId(practitionerId, isActive);
} }
@Override @Override
...@@ -196,4 +197,13 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService ...@@ -196,4 +197,13 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
public List<TeamMemberDetail> queryTeamMemberDetailList(List<Long> practitionerIdList) { public List<TeamMemberDetail> queryTeamMemberDetailList(List<Long> practitionerIdList) {
return aclPractitionerMapper.queryTeamMemberDetailList(practitionerIdList); return aclPractitionerMapper.queryTeamMemberDetailList(practitionerIdList);
} }
@Override
public List<String> findLeaveOfficeByPractitionerId(Long practitionerId) {
DESTypeHandler jpaCryptoConverter = new DESTypeHandler();
List<String> mobileNos = aclPractitionerMapper.findLeaveOfficeByPractitionerId(practitionerId);
List<String> mobileNoList = new ArrayList<>(mobileNos.size());
mobileNos.forEach(m -> mobileNoList.add(jpaCryptoConverter.decode(m)));
return mobileNoList;
}
} }
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