Skip to content

Y
yd-backend
Commit 0d630b36 by jianan
Options

零时薪资单3

parent 8f07e369
Showing with 35 additions and 29 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
...@@ -387,7 +387,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -387,7 +387,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
// 查询历史才需要执行 // 查询历史才需要执行
resultList = this.historyEG(requestVO); resultList = this.historyEG(requestVO);
} else { } else {
// 查询全部，把N22和历史集合合并到一起 // 查询全部，把本年和历史集合合并到一起
resultList = this.queryAll(requestVO); resultList = this.queryAll(requestVO);
} }
...@@ -403,7 +403,6 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -403,7 +403,6 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
private List<PayScaleInfo> queryNew(PayScaleQueryRequestVO requestVO) throws Exception { private List<PayScaleInfo> queryNew(PayScaleQueryRequestVO requestVO) throws Exception {
// 1.先查本地新基本法的薪资 // 1.先查本地新基本法的薪资
// List<AgAclSalary> newSalaryList = agAclSalaryMapper.queryListByPractitionerId(requestVO.getPractitionerId());
List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerIdAndIsbasic(requestVO.getPractitionerId(), 1); List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerIdAndIsbasic(requestVO.getPractitionerId(), 1);
List<PayScaleInfo> salaryList = this.translateAgAclLifePractitionerSalaryToPayScaleInfo(list); List<PayScaleInfo> salaryList = this.translateAgAclLifePractitionerSalaryToPayScaleInfo(list);
...@@ -420,8 +419,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -420,8 +419,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
} }
for (PayScaleInfo infoN22 : listN22) { for (PayScaleInfo infoN22 : listN22) {
year = infoN22.getYears() == null ? "0" : infoN22.getYears(); year = infoN22.getYears() == null ? "" : infoN22.getYears();
month = infoN22.getMonth() == null ? "0" : infoN22.getMonth(); month = infoN22.getMonth() == null ? "" : infoN22.getMonth();
yearMonth = this.getYearMonth(year, month); yearMonth = this.getYearMonth(year, month);
infoN22.setMonDtlPeriod(yearMonth); infoN22.setMonDtlPeriod(yearMonth);
if (!map.containsKey(yearMonth)) { if (!map.containsKey(yearMonth)) {
...@@ -769,34 +768,17 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -769,34 +768,17 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
@Override @Override
public QuerySalaryDetailResponseVO querySalaryDetail(QuerySalaryDetailRequestVO requestVO) { public QuerySalaryDetailResponseVO querySalaryDetail(QuerySalaryDetailRequestVO requestVO) {
QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO(); QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO();
// N22 // isBasic为0时查询N22，为1时查询本地数据库表
if ("0".equals(requestVO.getIsBasic())) { if ("0".equals(requestVO.getIsBasic())) {
// 1.检查请求参数 this.querySalaryDetailFromN22(requestVO, responseVO);
if (StringUtils.isBlank(requestVO.getYears())||StringUtils.isBlank(requestVO.getMonth())) { } else {
responseVO.setCommonResult(new CommonResult(false, "查询年月不能为空")); this.querySalaryDetail(requestVO, responseVO);
return responseVO;
} }
// 2.查询佣金和税的接口
SalaryDetailsSearchRequestBody salaryDetailsSearchRequestBody = new SalaryDetailsSearchRequestBody();
this.handleDateParams(salaryDetailsSearchRequestBody, requestVO);
salaryDetailsSearchRequestBody.setLoginName(requestVO.getAgent_id());
salaryDetailsSearchRequestBody.setSearchType("1");
salaryDetailsSearchRequestBody.setPaid_Status("3");
salaryDetailsSearchRequestBody.setCheckStatus("1");
SalaryDetailsSearchResponseVO salaryDetailsSearchResponseVO = n22SalaryService.salaryDetailsSearch(salaryDetailsSearchRequestBody); return responseVO;
// 3.组装前端数据
if ("查询成功".equals(salaryDetailsSearchResponseVO.getResponseHead().getMessage())) {
SalaryDetailsSearchResponseBody salaryDetails = salaryDetailsSearchResponseVO.getResponseBody();
this.createQuerySalaryDetailResponseVO(responseVO, salaryDetails);
responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
} else {
responseVO.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("820001")));
} }
} else {
private void querySalaryDetail(QuerySalaryDetailRequestVO requestVO, QuerySalaryDetailResponseVO responseVO) {
Long practitionerId = requestVO.getPractitionerId(); Long practitionerId = requestVO.getPractitionerId();
if (null != practitionerId) { if (null != practitionerId) {
String years = requestVO.getYears(); String years = requestVO.getYears();
...@@ -835,7 +817,31 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -835,7 +817,31 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
} }
} }
return responseVO; private void querySalaryDetailFromN22(QuerySalaryDetailRequestVO requestVO, QuerySalaryDetailResponseVO responseVO) {
// 1.检查请求参数
if (StringUtils.isBlank(requestVO.getYears())||StringUtils.isBlank(requestVO.getMonth())) {
responseVO.setCommonResult(new CommonResult(false, "查询年月不能为空"));
}
// 2.查询佣金和税的接口
SalaryDetailsSearchRequestBody salaryDetailsSearchRequestBody = new SalaryDetailsSearchRequestBody();
this.handleDateParams(salaryDetailsSearchRequestBody, requestVO);
salaryDetailsSearchRequestBody.setLoginName(requestVO.getAgent_id());
salaryDetailsSearchRequestBody.setSearchType("1");
salaryDetailsSearchRequestBody.setPaid_Status("3");
salaryDetailsSearchRequestBody.setCheckStatus("1");
SalaryDetailsSearchResponseVO salaryDetailsSearchResponseVO = n22SalaryService.salaryDetailsSearch(salaryDetailsSearchRequestBody);
// 3.组装前端数据
if ("查询成功".equals(salaryDetailsSearchResponseVO.getResponseHead().getMessage())) {
SalaryDetailsSearchResponseBody salaryDetails = salaryDetailsSearchResponseVO.getResponseBody();
this.createQuerySalaryDetailResponseVO(responseVO, salaryDetails);
responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
} else {
responseVO.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("820001")));
}
} }
private void handleDateParams(SalaryDetailsSearchRequestBody salaryDetailsSearchRequestBody, QuerySalaryDetailRequestVO requestVO) { private void handleDateParams(SalaryDetailsSearchRequestBody salaryDetailsSearchRequestBody, QuerySalaryDetailRequestVO requestVO) {
......
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