Commit ef2eb51c authored by huyuchen's avatar huyuchen

实缴导入校验项目

parent 60e087c1
...@@ -13,7 +13,6 @@ public class SocialConstants { ...@@ -13,7 +13,6 @@ public class SocialConstants {
public static final String DIFF_TYPE_THR = "实缴"; public static final String DIFF_TYPE_THR = "实缴";
public static final String DIFF_TYPE_TWO = "差额"; public static final String DIFF_TYPE_TWO = "差额";
public static final String ERROR_TEMPLATE = "模板中已存在对应员工"; public static final String ERROR_TEMPLATE = "模板中已存在对应员工";
public static final String EXIT_TEMPLATE = "已存在对应员工身份证";
public static final String YL = "养老"; public static final String YL = "养老";
public static final String DB = "大病"; public static final String DB = "大病";
...@@ -24,4 +23,9 @@ public class SocialConstants { ...@@ -24,4 +23,9 @@ public class SocialConstants {
public static final String BJ = "补缴"; public static final String BJ = "补缴";
public static final String YEAR_1970 = "1970-02"; public static final String YEAR_1970 = "1970-02";
public static final String NOT_EXIT_SETTLEiNFO = "未找到该人员对应的项目信息,请核实";
public static final String ERROR_PRI = "该人员归属的";
public static final String ERROR_END = "信息缺失,将导致后续无法结算,请联系卢名旭处理";
} }
...@@ -1259,9 +1259,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1259,9 +1259,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else { } else {
domain = null; domain = null;
} }
if (Common.isNotNull(domain)) { if (Common.isEmpty(domain)) {
paymentInfo.setBpoFlag(domain.getBpoFlag()); errorMessageMap.put(UUID.randomUUID().toString(), new ErrorDetailVO(infoVo.getRowIndex(),
CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(),
paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.NOT_EXIT_SETTLEiNFO));
continue;
} }
paymentInfo.setBpoFlag(domain.getBpoFlag());
paymentInfo.setSettleDomainId(socialInfo.getSettleDomain()); paymentInfo.setSettleDomainId(socialInfo.getSettleDomain());
paymentInfo.setSettleDomainName(socialInfo.getSettleDomainName()); paymentInfo.setSettleDomainName(socialInfo.getSettleDomainName());
paymentInfo.setSettleDomainCode(socialInfo.getSettleDomainCode()); paymentInfo.setSettleDomainCode(socialInfo.getSettleDomainCode());
...@@ -1281,12 +1285,16 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1281,12 +1285,16 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else { } else {
domain = null; domain = null;
} }
if (Common.isNotNull(domain)) { if (Common.isEmpty(domain)) {
errorMessageMap.put(UUID.randomUUID().toString(), new ErrorDetailVO(infoVo.getRowIndex(),
CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(),
paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.NOT_EXIT_SETTLEiNFO));
continue;
}
paymentInfo.setSettleDomainName(domain.getDepartName()); paymentInfo.setSettleDomainName(domain.getDepartName());
paymentInfo.setUnitId(domain.getCustomerId()); paymentInfo.setUnitId(domain.getCustomerId());
paymentInfo.setUnitName(domain.getCustomerName()); paymentInfo.setUnitName(domain.getCustomerName());
paymentInfo.setBpoFlag(domain.getBpoFlag()); paymentInfo.setBpoFlag(domain.getBpoFlag());
}
paymentInfo.setSettleDomainId(tSocialInfo.getSettleDomain()); paymentInfo.setSettleDomainId(tSocialInfo.getSettleDomain());
paymentInfo.setSettleDomainCode(tSocialInfo.getSettleDomainCode()); paymentInfo.setSettleDomainCode(tSocialInfo.getSettleDomainCode());
paymentInfo.setSocialProvince(tSocialInfo.getSocialProvince()); paymentInfo.setSocialProvince(tSocialInfo.getSocialProvince());
...@@ -1299,7 +1307,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1299,7 +1307,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (!Common.isEmpty(erroeInfo)){ if (!Common.isEmpty(erroeInfo)){
errorMessageMap.put(UUID.randomUUID().toString(), new ErrorDetailVO(infoVo.getRowIndex(), errorMessageMap.put(UUID.randomUUID().toString(), new ErrorDetailVO(infoVo.getRowIndex(),
CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(),
paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), "该人员归属的" + erroeInfo + "信息缺失,将导致后续无法结算,请联系卢名旭处理")); paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.ERROR_PRI
+ erroeInfo + SocialConstants.ERROR_END));
continue; continue;
} }
if (Common.isNotNull(tSocialInfo)) { if (Common.isNotNull(tSocialInfo)) {
...@@ -1759,9 +1768,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1759,9 +1768,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else { } else {
domain = null; domain = null;
} }
if (Common.isNotNull(domain)) { if (Common.isEmpty(domain)) {
paymentInfo.setBpoFlag(domain.getBpoFlag()); errorMessageList.add(new ErrorDetailVO(infoVo.getRowIndex(),
CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(),
paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.NOT_EXIT_SETTLEiNFO));
continue;
} }
paymentInfo.setBpoFlag(domain.getBpoFlag());
paymentInfo.setSettleDomainId(fund.getSettleDomainFund()); paymentInfo.setSettleDomainId(fund.getSettleDomainFund());
paymentInfo.setSettleDomainName(fund.getSettleDomainNameFund()); paymentInfo.setSettleDomainName(fund.getSettleDomainNameFund());
paymentInfo.setSettleDomainCode(fund.getSettleDomainCodeFund()); paymentInfo.setSettleDomainCode(fund.getSettleDomainCodeFund());
...@@ -1781,12 +1794,16 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1781,12 +1794,16 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else { } else {
domain = null; domain = null;
} }
if (Common.isNotNull(domain)) { if (Common.isEmpty(domain)) {
errorMessageList.add(new ErrorDetailVO(infoVo.getRowIndex(),
CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(),
paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.NOT_EXIT_SETTLEiNFO));
continue;
}
paymentInfo.setSettleDomainName(domain.getDepartName()); paymentInfo.setSettleDomainName(domain.getDepartName());
paymentInfo.setUnitId(domain.getCustomerId()); paymentInfo.setUnitId(domain.getCustomerId());
paymentInfo.setUnitName(domain.getCustomerName()); paymentInfo.setUnitName(domain.getCustomerName());
paymentInfo.setBpoFlag(domain.getBpoFlag()); paymentInfo.setBpoFlag(domain.getBpoFlag());
}
paymentInfo.setSettleDomainId(tProvidentFund.getSettleDomain()); paymentInfo.setSettleDomainId(tProvidentFund.getSettleDomain());
paymentInfo.setSettleDomainCode(tProvidentFund.getSettleDomainCode()); paymentInfo.setSettleDomainCode(tProvidentFund.getSettleDomainCode());
paymentInfo.setFundProvince(tProvidentFund.getFundProvince()); paymentInfo.setFundProvince(tProvidentFund.getFundProvince());
...@@ -1799,7 +1816,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1799,7 +1816,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (!Common.isEmpty(erroeInfo)){ if (!Common.isEmpty(erroeInfo)){
errorMessageList.add(new ErrorDetailVO(infoVo.getRowIndex(), errorMessageList.add(new ErrorDetailVO(infoVo.getRowIndex(),
CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(),
paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), "该人员归属的" + erroeInfo + "信息缺失,将导致后续无法结算,请联系卢名旭处理")); paymentInfo.getProvidentHousehold(), infoVo.getEmpName(),
SocialConstants.ERROR_PRI + erroeInfo + SocialConstants.ERROR_END));
continue; continue;
} }
if (Common.isNotNull(tProvidentFund)) { if (Common.isNotNull(tProvidentFund)) {
...@@ -2430,9 +2448,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2430,9 +2448,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else { } else {
domain = null; domain = null;
} }
if (Common.isNotNull(domain)) { if (Common.isEmpty(domain)) {
payExists.setBpoFlag(domain.getBpoFlag()); errorMessageList.put(UUID.randomUUID().toString(), new ErrorDetailVO(infoVo.getRowIndex(),
CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), payExists.getSocialHousehold(),
payExists.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.NOT_EXIT_SETTLEiNFO));
continue;
} }
payExists.setBpoFlag(domain.getBpoFlag());
payExists.setSettleDomainId(socialInfo.getSettleDomain()); payExists.setSettleDomainId(socialInfo.getSettleDomain());
payExists.setSettleDomainCode(Common.isNotNull(socialInfo.getSettleDomainCode()) ? socialInfo.getSettleDomainCode(): ""); payExists.setSettleDomainCode(Common.isNotNull(socialInfo.getSettleDomainCode()) ? socialInfo.getSettleDomainCode(): "");
payExists.setUnitId(Common.isNotNull(socialInfo.getUnitId()) ? socialInfo.getUnitId(): ""); payExists.setUnitId(Common.isNotNull(socialInfo.getUnitId()) ? socialInfo.getUnitId(): "");
...@@ -2451,14 +2473,18 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2451,14 +2473,18 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else { } else {
domain = null; domain = null;
} }
if (Common.isEmpty(domain)) {
errorMessageList.put(UUID.randomUUID().toString(), new ErrorDetailVO(infoVo.getRowIndex(),
CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), payExists.getSocialHousehold(),
payExists.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.NOT_EXIT_SETTLEiNFO));
continue;
}
payExists.setSettleDomainId(tSocialInfo.getSettleDomain()); payExists.setSettleDomainId(tSocialInfo.getSettleDomain());
payExists.setSettleDomainCode(tSocialInfo.getSettleDomainCode()); payExists.setSettleDomainCode(tSocialInfo.getSettleDomainCode());
if (Common.isNotNull(domain)) {
payExists.setSettleDomainName(domain.getDepartName()); payExists.setSettleDomainName(domain.getDepartName());
payExists.setUnitId(domain.getCustomerId()); payExists.setUnitId(domain.getCustomerId());
payExists.setUnitName(domain.getCustomerName()); payExists.setUnitName(domain.getCustomerName());
payExists.setBpoFlag(domain.getBpoFlag()); payExists.setBpoFlag(domain.getBpoFlag());
}
payExists.setSocialProvince(tSocialInfo.getSocialProvince()); payExists.setSocialProvince(tSocialInfo.getSocialProvince());
payExists.setSocialCity(tSocialInfo.getSocialCity()); payExists.setSocialCity(tSocialInfo.getSocialCity());
payExists.setSocialTown(tSocialInfo.getSocialTown()); payExists.setSocialTown(tSocialInfo.getSocialTown());
...@@ -2469,7 +2495,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2469,7 +2495,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (!Common.isEmpty(erroeInfo)){ if (!Common.isEmpty(erroeInfo)){
errorMessageList.put(UUID.randomUUID().toString(), new ErrorDetailVO(infoVo.getRowIndex(), errorMessageList.put(UUID.randomUUID().toString(), new ErrorDetailVO(infoVo.getRowIndex(),
CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), payExists.getSocialHousehold(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), payExists.getSocialHousehold(),
payExists.getProvidentHousehold(), infoVo.getEmpName(), "该人员归属的" + erroeInfo + "信息缺失,将导致后续无法结算,请联系卢名旭处理")); payExists.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.ERROR_PRI
+ erroeInfo + SocialConstants.ERROR_END));
continue; continue;
} }
if (Common.isNotNull(tSocialInfo)) { if (Common.isNotNull(tSocialInfo)) {
......
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