Skip to content

Y
yd-backend
Commit af2e3a68 by hongzhong
Options

薪资单调整，1，AGMS可以预览,预览标志调整

parent c1c50113
Showing with 35 additions and 9 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
...@@ -392,7 +392,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -392,7 +392,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
List<PayScaleInfo> resultList = new ArrayList<>(); List<PayScaleInfo> resultList = new ArrayList<>();
//如果是预览薪资单，则跳过权限校验 //如果是预览薪资单，则跳过权限校验
if(null == requestVO.getIsActive() || requestVO.getIsActive().intValue() != 0){ if("AGMS".equals(requestVO.getPreFlag())){
//等保调整 //等保调整
List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(requestVO.getPractitionerId(),null); List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(requestVO.getPractitionerId(),null);
if(null == findByObjSortable ){ if(null == findByObjSortable ){
...@@ -425,7 +425,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -425,7 +425,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
// 1.先查本地新基本法的薪资 // 1.先查本地新基本法的薪资
List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerIdAndIsbasic(requestVO.getPractitionerId(), 1,requestVO.getIsActive()); List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerIdAndIsbasic(requestVO.getPractitionerId(), 1,requestVO.getIsActive());
List<PayScaleInfo> salaryList = this.translateAgAclLifePractitionerSalaryToPayScaleInfo(list); List<PayScaleInfo> salaryList = this.translateAgAclLifePractitionerSalaryToPayScaleInfo(list,requestVO.getPreFlag());
// 2.再查N22 // 2.再查N22
List<PayScaleInfo> listN22 = this.queryPayScaleListFromN22(requestVO); List<PayScaleInfo> listN22 = this.queryPayScaleListFromN22(requestVO);
...@@ -458,7 +458,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -458,7 +458,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
return resultList; return resultList;
} }
private List<PayScaleInfo> translateAgAclLifePractitionerSalaryToPayScaleInfo(List<AgAclLifePractitionerSalary> newSalaryList) { private List<PayScaleInfo> translateAgAclLifePractitionerSalaryToPayScaleInfo(List<AgAclLifePractitionerSalary> newSalaryList,String preFlag) {
List<PayScaleInfo> resultList = new ArrayList<>(); List<PayScaleInfo> resultList = new ArrayList<>();
PayScaleInfo payScaleInfo; PayScaleInfo payScaleInfo;
String time; String time;
...@@ -470,7 +470,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -470,7 +470,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue()); payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue());
payScaleInfo.setIsBasic(salary.getIsBasic()); payScaleInfo.setIsBasic(salary.getIsBasic());
payScaleInfo.setIsActive(salary.getIsActive()); payScaleInfo.setIsActive(salary.getIsActive());
payScaleInfo.setPreFlag(preFlag);//AGMS预览标志
time = payScaleInfo.getMonDtlPeriod(); time = payScaleInfo.getMonDtlPeriod();
if (StringUtils.isNotBlank(time)) { if (StringUtils.isNotBlank(time)) {
payScaleInfo.setYears(time.substring(0, 4)); payScaleInfo.setYears(time.substring(0, 4));
...@@ -644,7 +644,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -644,7 +644,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
// 加入临时薪资表的数据 // 加入临时薪资表的数据
List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerId(practitionerId,requestVO.getIsActive()); List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerId(practitionerId,requestVO.getIsActive());
translateObj(list, resultList); translateObj(list, resultList,requestVO.getPreFlag());
// 排序 // 排序
resultList.sort(Comparator.comparing(PayScaleInfo :: getMonDtlPeriod).reversed()); resultList.sort(Comparator.comparing(PayScaleInfo :: getMonDtlPeriod).reversed());
...@@ -673,7 +673,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -673,7 +673,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
return result; return result;
} }
private void translateObj(List<AgAclLifePractitionerSalary> list, List<PayScaleInfo> resultList) { private void translateObj(List<AgAclLifePractitionerSalary> list, List<PayScaleInfo> resultList,String preFlag) {
PayScaleInfo payScaleInfo; PayScaleInfo payScaleInfo;
String time; String time;
for (AgAclLifePractitionerSalary salary : list) { for (AgAclLifePractitionerSalary salary : list) {
...@@ -684,7 +684,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -684,7 +684,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
payScaleInfo.setMonDtlAmount(salary.getPayableAmount().doubleValue()); payScaleInfo.setMonDtlAmount(salary.getPayableAmount().doubleValue());
payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue()); payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue());
payScaleInfo.setIsBasic(salary.getIsBasic()); payScaleInfo.setIsBasic(salary.getIsBasic());
payScaleInfo.setIsActive(salary.getIsActive());
payScaleInfo.setPreFlag(preFlag);
resultList.add(payScaleInfo); resultList.add(payScaleInfo);
} }
...@@ -948,7 +949,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -948,7 +949,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
public QuerySalaryDetailResponseVO querySalaryDetail(QuerySalaryDetailRequestVO requestVO) { public QuerySalaryDetailResponseVO querySalaryDetail(QuerySalaryDetailRequestVO requestVO) {
QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO(); QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO();
//如果是预览薪资单，则跳过权限校验 //如果是预览薪资单，则跳过权限校验
if(null == requestVO.getIsActive() || requestVO.getIsActive().intValue() != 0){ if("AGMS".equals(requestVO.getPreFlag())){
//等保调整 //等保调整
Long practitionerId = requestVO.getPractitionerId(); Long practitionerId = requestVO.getPractitionerId();
if (null != practitionerId) { if (null != practitionerId) {
...@@ -1093,7 +1094,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -1093,7 +1094,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
return responseBody; return responseBody;
} }
//如果是预览薪资单，则跳过权限校验 //如果是预览薪资单，则跳过权限校验
if(null == requestVO.getIsActive() || requestVO.getIsActive().intValue() != 0) { if("AGMS".equals(requestVO.getPreFlag())){
//等保调整 //等保调整
List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(requestVO.getPractitionerId(),null); List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(requestVO.getPractitionerId(),null);
if(null == findByObjSortable ){ if(null == findByObjSortable ){
......
yd-api/src/main/java/com/yd/api/practitioner/vo/n22/QuerySalaryDetailRequestVO.java
...@@ -19,4 +19,8 @@ public class QuerySalaryDetailRequestVO { ...@@ -19,4 +19,8 @@ public class QuerySalaryDetailRequestVO {
* 0,预览薪资单，1，经纪人查看薪资单 * 0,预览薪资单，1，经纪人查看薪资单
*/ */
private Integer isActive; private Integer isActive;
/**
* AGMS 预览
*/
private String preFlag;
} }
yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleInfo.java
...@@ -27,8 +27,15 @@ public class PayScaleInfo { ...@@ -27,8 +27,15 @@ public class PayScaleInfo {
public void setIsActive(Integer isActive) { public void setIsActive(Integer isActive) {
this.isActive = isActive; this.isActive = isActive;
} }
private String preFlag;
public String getPreFlag() {
return preFlag;
}
public void setPreFlag(String preFlag) {
this.preFlag = preFlag;
}
public Long getMonShId() { public Long getMonShId() {
return monShId; return monShId;
......
yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleQueryRequestVO.java
...@@ -13,6 +13,10 @@ public class PayScaleQueryRequestVO { ...@@ -13,6 +13,10 @@ public class PayScaleQueryRequestVO {
* 0,预览薪资单，1，经纪人查看薪资单 * 0,预览薪资单，1，经纪人查看薪资单
*/ */
private Integer isActive; private Integer isActive;
/**
* AGMS 预览
*/
private String preFlag;
public String getPractitionerIdEG() { public String getPractitionerIdEG() {
return practitionerIdEG; return practitionerIdEG;
...@@ -45,4 +49,12 @@ public class PayScaleQueryRequestVO { ...@@ -45,4 +49,12 @@ public class PayScaleQueryRequestVO {
public void setIsActive(Integer isActive) { public void setIsActive(Integer isActive) {
this.isActive = isActive; this.isActive = isActive;
} }
public String getPreFlag() {
return preFlag;
}
public void setPreFlag(String preFlag) {
this.preFlag = preFlag;
}
} }
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsRequestBody.java
...@@ -19,4 +19,6 @@ public class SearchStaffSalaryDetailsRequestBody { ...@@ -19,4 +19,6 @@ public class SearchStaffSalaryDetailsRequestBody {
private String isBasic; private String isBasic;
private Integer isActive; private Integer isActive;
private String preFlag;
} }
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