Skip to content

Y
yd-backend
Commit 2038b313 by jianan
Options

薪资单N22经纪人不存在报错

parent bbbde1f4
Showing with 36 additions and 27 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
package com.yd.api.practitioner.service.impl; package com.yd.api.practitioner.service.impl;
import com.google.common.base.Strings; import com.google.common.base.Strings;
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.vo.n22.QuerySalaryDetailRequestVO; import com.yd.api.practitioner.vo.n22.QuerySalaryDetailRequestVO;
import com.yd.api.practitioner.vo.n22.QuerySalaryDetailResponseVO; import com.yd.api.practitioner.vo.n22.QuerySalaryDetailResponseVO;
import com.yd.api.practitioner.vo.n22.SalaryDetail; import com.yd.api.practitioner.vo.n22.SalaryDetail;
import com.yd.api.practitioner.vo.organization.*; import com.yd.api.practitioner.vo.organization.*;
import com.yd.api.practitioner.vo.payscale.PayScalePdfRequestVO; import com.yd.api.practitioner.vo.payscale.*;
import com.yd.api.practitioner.service.PractitionerBasicInfoService;
import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
import com.yd.api.practitioner.vo.payscale.PayScalePdfResponseVO;
import com.yd.api.practitioner.vo.payscale.PayScaleQueryRequestVO;
import com.yd.api.practitioner.vo.payscale.PayScaleQueryResponseVO;
import com.yd.api.practitioner.vo.policy.PolicyInfo; import com.yd.api.practitioner.vo.policy.PolicyInfo;
import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO; import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO;
import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO; import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO;
...@@ -72,12 +68,13 @@ import com.yd.util.CommonUtil; ...@@ -72,12 +68,13 @@ import com.yd.util.CommonUtil;
import com.yd.util.config.ZHBErrorConfig; import com.yd.util.config.ZHBErrorConfig;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.*; import java.io.File;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -85,6 +82,8 @@ import java.util.stream.Collectors; ...@@ -85,6 +82,8 @@ import java.util.stream.Collectors;
@Service("practitionerBasicInfoService") @Service("practitionerBasicInfoService")
public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoService { public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoService {
private final static Logger logger = LoggerFactory.getLogger(PractitionerBasicInfoServiceImpl.class);
@Autowired @Autowired
private AclPractitionerDALService aclPractitionerDALService; private AclPractitionerDALService aclPractitionerDALService;
@Autowired @Autowired
...@@ -390,13 +389,13 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -390,13 +389,13 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
// 查询全部，把本年和历史集合合并到一起 // 查询全部，把本年和历史集合合并到一起
resultList = this.queryAll(requestVO); resultList = this.queryAll(requestVO);
} }
responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
responseVO.setPayScaleInfos(resultList);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
responseVO.setCommonResult(new CommonResult(false, e.getMessage()));
} }
responseVO.setPayScaleInfos(resultList);
responseVO.setCommonResult(new CommonResult(true,ZHBErrorConfig.getErrorInfo("800000")));
return responseVO; return responseVO;
} }
...@@ -414,22 +413,25 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -414,22 +413,25 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
String yearMonth = ""; String yearMonth = "";
String year = ""; String year = "";
String month = ""; String month = "";
for (PayScaleInfo newSalary : salaryList) { if (CollectionUtils.isNotEmpty(salaryList)) {
map.put(newSalary.getMonDtlPeriod(), newSalary); for (PayScaleInfo newSalary : salaryList) {
map.put(newSalary.getMonDtlPeriod(), newSalary);
}
} }
for (PayScaleInfo infoN22 : listN22) { if (CollectionUtils.isNotEmpty(listN22)) {
year = infoN22.getYears() == null ? "" : infoN22.getYears(); for (PayScaleInfo infoN22 : listN22) {
month = infoN22.getMonth() == null ? "" : infoN22.getMonth(); year = infoN22.getYears() == null ? "" : infoN22.getYears();
yearMonth = this.getYearMonth(year, month); month = infoN22.getMonth() == null ? "" : infoN22.getMonth();
infoN22.setMonDtlPeriod(yearMonth); yearMonth = this.getYearMonth(year, month);
if (!map.containsKey(yearMonth)) { infoN22.setMonDtlPeriod(yearMonth);
map.put(yearMonth, infoN22); if (!map.containsKey(yearMonth)) {
map.put(yearMonth, infoN22);
}
} }
} }
ArrayList<PayScaleInfo> resultList = new ArrayList<>(map.values()); ArrayList<PayScaleInfo> resultList = new ArrayList<>(map.values());
// 排序 // 排序
resultList.sort(Comparator.comparing(PayScaleInfo :: getMonDtlPeriod).reversed()); resultList.sort(Comparator.comparing(PayScaleInfo::getMonDtlPeriod).reversed());
return resultList; return resultList;
} }
...@@ -500,7 +502,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -500,7 +502,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
return yearMonth; return yearMonth;
} }
private List<PayScaleInfo> queryPayScaleListFromN22(PayScaleQueryRequestVO requestVO) throws Exception { private List<PayScaleInfo> queryPayScaleListFromN22(PayScaleQueryRequestVO requestVO) {
Long practitionerId = requestVO.getPractitionerId(); Long practitionerId = requestVO.getPractitionerId();
String isHistory = requestVO.getIsHistory(); String isHistory = requestVO.getIsHistory();
...@@ -508,7 +510,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -508,7 +510,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
String mobileNo = aclPractitionerDALService.findMobileNoByPractitionerId(practitionerId); String mobileNo = aclPractitionerDALService.findMobileNoByPractitionerId(practitionerId);
Staff staff = n22StaffService.queryN22StaffByMobileNo(mobileNo); Staff staff = n22StaffService.queryN22StaffByMobileNo(mobileNo);
if (staff == null || StringUtils.isBlank(staff.getAgent_id())) { if (staff == null || StringUtils.isBlank(staff.getAgent_id())) {
throw new Exception("未查询到N22LoginName"); logger.error("未查询到N22LoginName");
return null;
} }
// 1.根据Agent_id当前经纪人的佣金明细 // 1.根据Agent_id当前经纪人的佣金明细
...@@ -526,7 +529,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -526,7 +529,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
SalaryDetailsSearchResponseVO salaryDetailsSearchResponseVO = n22SalaryService.salaryDetailsSearch(salaryDetailsSearchRequestBody); SalaryDetailsSearchResponseVO salaryDetailsSearchResponseVO = n22SalaryService.salaryDetailsSearch(salaryDetailsSearchRequestBody);
if (!"查询成功".equals(salaryDetailsSearchResponseVO.getResponseHead().getMessage())){ if (!"查询成功".equals(salaryDetailsSearchResponseVO.getResponseHead().getMessage())){
throw new Exception(salaryDetailsSearchResponseVO.getResponseHead().getMessage()); logger.error(salaryDetailsSearchResponseVO.getResponseHead().getMessage());
return null;
} }
List<SalaryDetails> salaryDetailsList = salaryDetailsSearchResponseVO.getResponseBody().getSalaryDetailsLIST(); List<SalaryDetails> salaryDetailsList = salaryDetailsSearchResponseVO.getResponseBody().getSalaryDetailsLIST();
......
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
...@@ -288,8 +288,13 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -288,8 +288,13 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
//查询该手机号码的经纪人id，是否存在 //查询该手机号码的经纪人id，是否存在
Map<Integer, PractitionerBasicInfo> practitionerBasicInfoMap = getPractitionerBasicInfo(mobileNo); Map<Integer, PractitionerBasicInfo> practitionerBasicInfoMap = getPractitionerBasicInfo(mobileNo);
if (!practitionerBasicInfoMap.isEmpty()) { if (!practitionerBasicInfoMap.isEmpty()) {
PractitionerBasicInfo practitionerBasicInfo1 = practitionerBasicInfoMap.get(1);
Long practitionerTypeId = practitionerBasicInfoMap.get(1).getPractitionerTypeId(); Long practitionerTypeId = null;
if (null == practitionerBasicInfo1) {
responseVO.setCommonResult(new CommonResult(false, "该经纪人不存在"));
return responseVO;
}
practitionerTypeId = practitionerBasicInfo1.getPractitionerTypeId();
PractitionerBasicInfo practitionerBasicInfo = practitionerBasicInfoMap.get(platform); PractitionerBasicInfo practitionerBasicInfo = practitionerBasicInfoMap.get(platform);
if (practitionerBasicInfo != null && practitionerTypeId != null) { if (practitionerBasicInfo != null && practitionerTypeId != null) {
......
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