Commit 79047829 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.0' into MVP1.7.0

parents 23c778f2 56bfa3ed
......@@ -59,10 +59,10 @@ public class EkpInsuranceUtil {
//必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果
HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers);
//有返回值的情况 VO可以替换成具体的JavaBean
log.error("推送EKP开始,formValues:"+formValues);
log.info("推送EKP开始,formValues:"+formValues);
ResponseEntity<String> obj = yourRestTemplate.exchange(ekpInsuranceProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class);
String body = obj.getBody();
log.error("推送EKP结果,body:"+body);
log.info("推送EKP结果,body:"+body);
if (StringUtils.isBlank(body)){
log.error("交易失败:"+obj);
return null;
......@@ -84,7 +84,7 @@ public class EkpInsuranceUtil {
* @return {@link String}
*/
public String sendUpdateToEkp(EkpUpdateParam param){
log.error("推送EKP开始--商险修改");
log.info("推送EKP开始--商险修改");
RestTemplate yourRestTemplate = new RestTemplate();
try{
String formValues = new ObjectMapper().writeValueAsString(param);
......@@ -107,7 +107,7 @@ public class EkpInsuranceUtil {
//有返回值的情况 VO可以替换成具体的JavaBean
ResponseEntity<String> obj = yourRestTemplate.exchange(ekpInsuranceProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class);
String body = obj.getBody();
log.error("推送EKP结果,body:"+body);
log.info("推送EKP结果,body:"+body);
if (StringUtils.isBlank(body)){
log.error(EkpConstants.SEND_FAILED);
return null;
......
......@@ -570,7 +570,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
// 银行卡
// 代发户的,不校验卡号,下次使用的时候校验卡号
// todo cyx-mvp1.7.0: 本次是代发户,是新员工,也要要校验银行卡(但是薪酬导入类型是劳务费才会走到这里)
// cyx-mvp1.7.0: 本次是代发户,是新员工,也要要校验银行卡(但是薪酬导入类型是劳务费才会走到这里)
if (Common.isNotNull(employee.getBankNo())) {
//if (Common.isNotNull(employee.getBankNo()) && (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))) {
// 调用校验服务
......
......@@ -278,9 +278,8 @@ public class SalaryAccountUtil implements Serializable {
newEmp.setEmpName(empName);
}
// todo cyx-mvp1.7.0修复:去掉重复判断
if ((SalaryConstants.IF_NEW_EMPLOYEE.equals(dbFiedName) || SalaryConstants.IS_NEW_EMPLOYEE.equals(dbFiedName))
&& SalaryConstants.IS_NEW.equals(cellValueStr)) {
// cyx-mvp1.7.0修复:去掉重复判断
if (SalaryConstants.IF_NEW_EMPLOYEE.equals(dbFiedName) && SalaryConstants.IS_NEW.equals(cellValueStr)) {
isNewEmployee = true;
entity.setIsNewEmployee(CommonConstants.ONE_STRING);
}
......@@ -632,13 +631,11 @@ public class SalaryAccountUtil implements Serializable {
}
if (canSave) {
log.error("走到了》》》》canSave");
log.error("走到了》》》》saveNewEmpList>>>{}",saveNewEmpList.toString());
// 新增
if (!saveNewEmpList.isEmpty()) {
log.error("走到了》》》》saveNewEmpList");
tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList);
}
log.error("走到了》》》》updateEmpBankList>>>{}",updateEmpBankList.toString());
// 更新人员信息
if (!updateEmpBankList.isEmpty()) {
log.error("走到了》》》》updateEmpBankList");
......
......@@ -1216,7 +1216,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince())
.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity())
.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_INT) //兼容历史数据的调整
.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_STRING) //兼容历史数据的调整
.in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus)
);
if (CollectionUtils.isNotEmpty(socialist)) {
......@@ -1245,7 +1245,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitMoney = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(SocialConstants.YL));
if (pensionMoneyMap.get(exitMoney) != null && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getUnitPensionMoney()), BigDecimalUtils.isNullToZero(
infoVo.getPersonalPensionMoney())), pensionMoneyMap.get(exitMoney)).compareTo(BigDecimal.ZERO) > 0) {
infoVo.getPersonalPensionMoney())), pensionMoneyMap.get(exitMoney),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), infoVo.getSocialHousehold(), infoVo.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.ERROR_TEMPLATE + "的养老缴费数据"));
continue;
} else {
......@@ -1256,7 +1256,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitMoney = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(SocialConstants.BJ));
if (accrualMoneyMap.get(exitMoney) != null && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getPersonalAccrual()), BigDecimalUtils.isNullToZero(
infoVo.getCompanyAccrual())), accrualMoneyMap.get(exitMoney)).compareTo(BigDecimal.ZERO) > 0) {
infoVo.getCompanyAccrual())), accrualMoneyMap.get(exitMoney),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), infoVo.getSocialHousehold(), infoVo.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.ERROR_TEMPLATE + "的补缴缴费数据"));
continue;
} else {
......@@ -1268,7 +1268,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitMoney = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(SocialConstants.YB));
if (medicalMoneyMap.get(exitMoney) != null && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getUnitMedicalMoney()), BigDecimalUtils.isNullToZero(
infoVo.getPersonalMedicalMoney())), medicalMoneyMap.get(exitMoney)).compareTo(BigDecimal.ZERO) > 0) {
infoVo.getPersonalMedicalMoney())), medicalMoneyMap.get(exitMoney),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), infoVo.getSocialHousehold(), infoVo.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.ERROR_TEMPLATE + "的医保缴费数据"));
continue;
} else {
......@@ -1280,7 +1280,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitMoney = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(SocialConstants.SY));
if (unEmpMoneyMap.get(exitMoney) != null && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getUnitUnemploymentMoney()), BigDecimalUtils.isNullToZero(
infoVo.getPersonalUnemploymentMoney())), unEmpMoneyMap.get(exitMoney)).compareTo(BigDecimal.ZERO) > 0) {
infoVo.getPersonalUnemploymentMoney())), unEmpMoneyMap.get(exitMoney),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), infoVo.getSocialHousehold(), infoVo.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.ERROR_TEMPLATE + "的失业缴费数据"));
continue;
} else {
......@@ -1300,7 +1300,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//生育
exitMoney = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(SocialConstants.BIR));
if (birMoneyMap.get(exitMoney) != null && BigDecimalUtils.safeMultiply(BigDecimalUtils.isNullToZero(infoVo.getUnitBirthMoney()),
birMoneyMap.get(exitMoney)).compareTo(BigDecimal.ZERO) > 0) {
birMoneyMap.get(exitMoney),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), infoVo.getSocialHousehold(), infoVo.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.ERROR_TEMPLATE + "的生育缴费数据"));
continue;
} else {
......@@ -1311,7 +1311,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (bigMoneyMap.get(exitMoney) != null && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getUnitBigmailmentMoney()),
BigDecimalUtils.isNullToZero(infoVo.getPersonalBigmailmentMoney())),
bigMoneyMap.get(exitMoney)).compareTo(BigDecimal.ZERO) > 0) {
bigMoneyMap.get(exitMoney),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), infoVo.getSocialHousehold(), infoVo.getProvidentHousehold(), infoVo.getEmpName(), SocialConstants.ERROR_TEMPLATE + "的医疗救助金缴费数据"));
continue;
} else {
......@@ -1338,7 +1338,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(infoVo.getUnitPensionMoney()),
BigDecimalUtils.isNullToZero(infoVo.getPersonalPensionMoney())), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(paymentInfo.getUnitPensionMoney()),
BigDecimalUtils.isNullToZero(paymentInfo.getPersonalPensionMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(paymentInfo.getPersonalPensionMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(), paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的养老缴费数据,请勿重复导入!"));
continue;
......@@ -1363,7 +1363,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(infoVo.getPersonalAccrual()),
BigDecimalUtils.isNullToZero(infoVo.getCompanyAccrual())), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(paymentInfo.getPersonalAccrual()),
BigDecimalUtils.isNullToZero(paymentInfo.getCompanyAccrual()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(paymentInfo.getCompanyAccrual())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(), paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的补缴缴费数据,请勿重复导入!"));
continue;
......@@ -1388,7 +1388,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils.isNullToZero(infoVo.getUnitUnemploymentMoney()),
BigDecimalUtils.isNullToZero(infoVo.getPersonalUnemploymentMoney())), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(paymentInfo.getUnitUnemploymentMoney()),
BigDecimalUtils.isNullToZero(paymentInfo.getPersonalUnemploymentMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(paymentInfo.getPersonalUnemploymentMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(), paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的失业缴费数据,请勿重复导入!"));
continue;
......@@ -1414,7 +1414,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils.isNullToZero(infoVo.getUnitMedicalMoney()),
BigDecimalUtils.isNullToZero(infoVo.getPersonalMedicalMoney())), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(paymentInfo.getUnitMedicalMoney()),
BigDecimalUtils.isNullToZero(paymentInfo.getPersonalMedicalMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(paymentInfo.getPersonalMedicalMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(), paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的医保缴费数据,请勿重复导入!"));
continue;
......@@ -1439,7 +1439,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils.isNullToZero(infoVo.getUnitBigmailmentMoney()),
BigDecimalUtils.isNullToZero(infoVo.getPersonalBigmailmentMoney())), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(paymentInfo.getUnitBigmailmentMoney()),
BigDecimalUtils.isNullToZero(paymentInfo.getPersonalBigmailmentMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(paymentInfo.getPersonalBigmailmentMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(), paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的医疗救助金缴费数据,请勿重复导入!"));
continue;
......@@ -1460,7 +1460,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//存在社保缴费数据
if (null != paymentInfo && ((null != paymentInfo.getGsSameFlg() && CommonConstants.ONE_STRING.equals(paymentInfo.getGsSameFlg()))
|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.isNullToZero(infoVo.getUnitInjuryMoney()),
BigDecimalUtils.isNullToZero(paymentInfo.getUnitInjuryMoney())).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(paymentInfo.getUnitInjuryMoney()),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(), paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的单位工伤缴费数据,请勿重复导入!"));
continue;
......@@ -1481,7 +1481,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//存在社保缴费数据
if (null != paymentInfo && ((null != paymentInfo.getBrSameFlg() && CommonConstants.ONE_STRING.equals(paymentInfo.getBrSameFlg()))
|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.isNullToZero(infoVo.getUnitBirthMoney()),
BigDecimalUtils.isNullToZero(paymentInfo.getUnitBirthMoney())).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(paymentInfo.getUnitBirthMoney()),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageMap.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(), paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的单位生育缴费数据,请勿重复导入!"));
continue;
......@@ -2883,7 +2883,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince().toString())
.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity().toString())
.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_INT) //兼容历史数据的调整
.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_STRING) //兼容历史数据的调整
.in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus)
);
if (CollectionUtils.isNotEmpty(socialist)) {
......@@ -2914,7 +2914,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitMoney = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.PENSION_RISK));
if (pensionMoneyMap.get(exitMoney) != null && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getPersonalMoney()), BigDecimalUtils.isNullToZero(
infoVo.getUnitMoney())), pensionMoneyMap.get(exitMoney)).compareTo(BigDecimal.ZERO) > 0) {
infoVo.getUnitMoney())), pensionMoneyMap.get(exitMoney),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), "", "",
infoVo.getEmpName(), SocialConstants.ERROR_TEMPLATE + "的养老缴费数据"));
continue;
......@@ -2938,7 +2938,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils.isNullToZero(infoVo.getPersonalMoney()),
BigDecimalUtils.isNullToZero(infoVo.getUnitMoney())), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(payExists.getUnitPensionMoney()),
BigDecimalUtils.isNullToZero(payExists.getPersonalPensionMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(payExists.getPersonalPensionMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), payExists.getSocialHousehold(), payExists.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的养老缴费数据,请勿重复导入!"));
continue;
......@@ -2951,7 +2951,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitMoney = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.UNEMPLOYEEMENT_RISK));
if (unEmpMoneyMap.get(exitMoney) != null && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getUnitMoney()), BigDecimalUtils.isNullToZero(
infoVo.getPersonalMoney())), unEmpMoneyMap.get(exitMoney)).compareTo(BigDecimal.ZERO) > 0) {
infoVo.getPersonalMoney())), unEmpMoneyMap.get(exitMoney),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), "", "",
infoVo.getEmpName(), SocialConstants.ERROR_TEMPLATE + "的失业缴费数据"));
continue;
......@@ -2976,7 +2976,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils.isNullToZero(infoVo.getPersonalMoney()),
BigDecimalUtils.isNullToZero(infoVo.getUnitMoney())), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(payExists.getUnitUnemploymentMoney()),
BigDecimalUtils.isNullToZero(payExists.getPersonalUnemploymentMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(payExists.getPersonalUnemploymentMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), payExists.getSocialHousehold(), payExists.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的失业缴费数据,请勿重复导入!"));
continue;
......@@ -2989,7 +2989,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitMoney = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.MEDICAL));
if (medicalMoneyMap.get(exitMoney) != null && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getUnitMedicalMoney()), BigDecimalUtils.isNullToZero(
infoVo.getPersonalMedicalMoney())), medicalMoneyMap.get(exitMoney)).compareTo(BigDecimal.ZERO) > 0) {
infoVo.getPersonalMedicalMoney())), medicalMoneyMap.get(exitMoney),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), "", "",
infoVo.getEmpName(), SocialConstants.ERROR_TEMPLATE + "的医保缴费数据"));
continue;
......@@ -3015,7 +3015,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils.isNullToZero(infoVo.getUnitMedicalMoney()),
BigDecimalUtils.isNullToZero(infoVo.getPersonalMedicalMoney())), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(payExists.getUnitMedicalMoney()),
BigDecimalUtils.isNullToZero(payExists.getPersonalMedicalMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(payExists.getPersonalMedicalMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), payExists.getSocialHousehold(), payExists.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的医保缴费数据,请勿重复导入!"));
continue;
......@@ -3029,7 +3029,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (injuryMoneyMap.get(exitMoney) != null && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getPersonalMoney()),
BigDecimalUtils.isNullToZero(infoVo.getUnitMoney())),
injuryMoneyMap.get(exitMoney)).compareTo(BigDecimal.ZERO) > 0) {
injuryMoneyMap.get(exitMoney),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), "", "",
infoVo.getEmpName(), SocialConstants.ERROR_TEMPLATE + "的工伤缴费数据"));
continue;
......@@ -3054,7 +3054,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getPersonalMoney()),
BigDecimalUtils.isNullToZero(infoVo.getUnitMoney())),
BigDecimalUtils.isNullToZero(payExists.getUnitInjuryMoney())).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(payExists.getUnitInjuryMoney()),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), payExists.getSocialHousehold(), payExists.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的单位工伤缴费数据,请勿重复导入!"));
continue;
......@@ -3068,7 +3068,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (bigMoneyMap.get(exitMoney) != null && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getUnitBigailmentMoney()),
BigDecimalUtils.isNullToZero(infoVo.getPersonalBigailmentMoney())),
bigMoneyMap.get(exitMoney)).compareTo(BigDecimal.ZERO) > 0) {
bigMoneyMap.get(exitMoney),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), "", "",
infoVo.getEmpName(), SocialConstants.ERROR_TEMPLATE + "的医疗救助金缴费数据"));
continue;
......@@ -3094,7 +3094,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils.isNullToZero(infoVo.getUnitBigailmentMoney()),
BigDecimalUtils.isNullToZero(infoVo.getPersonalBigailmentMoney())), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(payExists.getUnitBigmailmentMoney()),
BigDecimalUtils.isNullToZero(payExists.getPersonalBigmailmentMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(payExists.getPersonalBigmailmentMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), payExists.getSocialHousehold(), payExists.getProvidentHousehold(), infoVo.getEmpName(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的医疗救助金缴费数据,请勿重复导入!"));
continue;
......@@ -3356,7 +3356,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince().toString())
.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity().toString())
.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_INT) //兼容历史数据的调整
.eq(TSocialInfo::getDeleteFlag,CommonConstants.ZERO_STRING) //兼容历史数据的调整
.in(TSocialInfo::getHandleStatus, CommonConstants.socialInfoStatus));
if (CollectionUtils.isNotEmpty(socialist)) {
for (TSocialInfo socialInfo1 : socialist) {
......@@ -3487,7 +3487,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (PaymentConstants.COMPANY_YL.equals(infoVo.getRiskType())) {
if (pensionMoneyMap.get(exitMoneyCon) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, pensionMoneyMap.get(exitMoneyCon)).compareTo(BigDecimal.ZERO) > 0) {
, pensionMoneyMap.get(exitMoneyCon),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(), new ErrorMessage(infoVo.getRowIndex(),SocialConstants.ERROR_TEMPLATE + "的单位养老缴费数据",infoVo));
continue;
} else {
......@@ -3502,7 +3502,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else {
if (pensionMoneyMap.get(exitMoneyPer) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, pensionMoneyMap.get(exitMoneyPer)).compareTo(BigDecimal.ZERO) > 0) {
, pensionMoneyMap.get(exitMoneyPer),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(), new ErrorMessage(infoVo.getRowIndex(), SocialConstants.ERROR_TEMPLATE + "的个人养老缴费数据",infoVo));
continue;
} else {
......@@ -3534,7 +3534,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (null != payInsert && ((null != payInsert.getYbSameFlg() && CommonConstants.ONE_STRING.equals(payInsert.getYbSameFlg()))
|| (BigDecimalUtils.safeMultiply(payExists.getSocialSum(), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(payInsert.getUnitPensionMoney()),
BigDecimalUtils.isNullToZero(payInsert.getPersonalPensionMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(payInsert.getPersonalPensionMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的养老缴费数据,请勿重复导入!",infoVo));
continue;
......@@ -3551,7 +3551,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (PaymentConstants.COMPANY_UNEMPLOYEEMENT.equals(infoVo.getRiskType())) {
if (unEmpMoneyMap.get(exitMoneyCon) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, unEmpMoneyMap.get(exitMoneyCon)).compareTo(BigDecimal.ZERO) > 0) {
, unEmpMoneyMap.get(exitMoneyCon),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(), new ErrorMessage(infoVo.getRowIndex(), SocialConstants.ERROR_TEMPLATE + "的单位失业缴费数据",infoVo));
continue;
} else {
......@@ -3566,7 +3566,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else {
if (unEmpMoneyMap.get(exitMoneyPer) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, unEmpMoneyMap.get(exitMoneyPer)).compareTo(BigDecimal.ZERO) > 0) {
, unEmpMoneyMap.get(exitMoneyPer),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(), new ErrorMessage(infoVo.getRowIndex(), SocialConstants.ERROR_TEMPLATE + "的个人失业缴费数据",infoVo));
continue;
} else {
......@@ -3598,7 +3598,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (null != payInsert && ((null != payInsert.getSySameFlg() && CommonConstants.ONE_STRING.equals(payInsert.getSySameFlg()))
|| (BigDecimalUtils.safeMultiply(payExists.getSocialSum(), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(payInsert.getUnitUnemploymentMoney()),
BigDecimalUtils.isNullToZero(payInsert.getPersonalUnemploymentMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(payInsert.getPersonalUnemploymentMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的失业缴费数据,请勿重复导入!",infoVo));
continue;
......@@ -3615,7 +3615,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (PaymentConstants.COMPANY_MEDICAL.equals(infoVo.getRiskType())) {
if (medicalMoneyMap.get(exitMoneyCon) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, medicalMoneyMap.get(exitMoneyCon)).compareTo(BigDecimal.ZERO) > 0) {
, medicalMoneyMap.get(exitMoneyCon),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(), new ErrorMessage(infoVo.getRowIndex(), SocialConstants.ERROR_TEMPLATE + "的单位医疗缴费数据",infoVo));
continue;
} else {
......@@ -3630,7 +3630,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else {
if (medicalMoneyMap.get(exitMoneyPer) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, medicalMoneyMap.get(exitMoneyPer)).compareTo(BigDecimal.ZERO) > 0) {
, medicalMoneyMap.get(exitMoneyPer),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(), new ErrorMessage(infoVo.getRowIndex(), SocialConstants.ERROR_TEMPLATE + "的个人医疗缴费数据",infoVo));
continue;
} else {
......@@ -3662,7 +3662,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (null != payInsert && ((null != payInsert.getYlSameFlg() && CommonConstants.ONE_STRING.equals(payInsert.getYlSameFlg()))
|| (BigDecimalUtils.safeMultiply(payExists.getSocialSum(), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(payInsert.getUnitMedicalMoney()),
BigDecimalUtils.isNullToZero(payInsert.getPersonalMedicalMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(payInsert.getPersonalMedicalMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的医疗缴费数据,请勿重复导入!",infoVo));
continue;
......@@ -3677,7 +3677,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitInsertPaymnet = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.INJURY_RISK));
if (injuryMoneyMap.get(exitMoneyCon) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, injuryMoneyMap.get(exitMoneyCon)).compareTo(BigDecimal.ZERO) > 0) {
, injuryMoneyMap.get(exitMoneyCon),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(), new ErrorMessage(infoVo.getRowIndex(), SocialConstants.ERROR_TEMPLATE + "的单位工伤缴费数据",infoVo));
continue;
} else {
......@@ -3701,7 +3701,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//存在社保缴费数据
if (null != payInsert && ((null != payInsert.getGsSameFlg() && CommonConstants.ONE_STRING.equals(payInsert.getGsSameFlg()))
|| (BigDecimalUtils.safeMultiply(infoVo.getPaymentMoney(),
BigDecimalUtils.isNullToZero(payInsert.getUnitInjuryMoney())).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(payInsert.getUnitInjuryMoney()),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的单位工伤缴费数据,请勿重复导入!",infoVo));
continue;
......@@ -3718,7 +3718,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (PaymentConstants.COMPANY_BIG.equals(infoVo.getRiskType())) {
if (bigMoneyMap.get(exitMoneyCon) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, bigMoneyMap.get(exitMoneyCon)).compareTo(BigDecimal.ZERO) > 0) {
, bigMoneyMap.get(exitMoneyCon),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(), new ErrorMessage(infoVo.getRowIndex(), SocialConstants.ERROR_TEMPLATE + "的单位大病救助金缴费数据",infoVo));
continue;
} else {
......@@ -3733,7 +3733,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} else {
if (bigMoneyMap.get(exitMoneyPer) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, bigMoneyMap.get(exitMoneyPer)).compareTo(BigDecimal.ZERO) > 0) {
, bigMoneyMap.get(exitMoneyPer),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(), new ErrorMessage(infoVo.getRowIndex(), SocialConstants.ERROR_TEMPLATE + "的个人大病救助金缴费数据",infoVo));
continue;
} else {
......@@ -3764,7 +3764,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (null != payInsert && ((null != payInsert.getDbSameFlg() && CommonConstants.ONE_STRING.equals(payInsert.getDbSameFlg()))
|| (BigDecimalUtils.safeMultiply(payExists.getSocialSum(), BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(payInsert.getUnitBigmailmentMoney()),
BigDecimalUtils.isNullToZero(payInsert.getPersonalBigmailmentMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(payInsert.getPersonalBigmailmentMoney())),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorMessage(infoVo.getRowIndex(),"已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的大病救助金缴费数据,请勿重复导入!",infoVo));
continue;
......@@ -3779,7 +3779,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitInsertPaymnet = infoVo.getEmpIdcard().concat(infoVo.getSocialPayMonth().concat(infoVo.getSocialCreateMonth()).concat(PaymentConstants.BIRTH));
if (birthMoneyMap.get(exitMoneyCon) != null && BigDecimalUtils.safeMultiply(
BigDecimalUtils.isNullToZero(infoVo.getPaymentMoney())
, birthMoneyMap.get(exitMoneyCon)).compareTo(BigDecimal.ZERO) > 0) {
, birthMoneyMap.get(exitMoneyCon),6).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorMessage(infoVo.getRowIndex(), SocialConstants.ERROR_TEMPLATE +
"的单位生育缴费数据",infoVo));
continue;
......@@ -3805,7 +3805,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//存在社保缴费数据
if (null != payInsert && ((null != payInsert.getBrSameFlg() && CommonConstants.ONE_STRING.equals(payInsert.getBrSameFlg()))
|| (BigDecimalUtils.safeMultiply(infoVo.getPaymentMoney(),
BigDecimalUtils.isNullToZero(payInsert.getUnitBirthMoney())).compareTo(BigDecimal.ZERO) > 0))) {
BigDecimalUtils.isNullToZero(payInsert.getUnitBirthMoney()),6).compareTo(BigDecimal.ZERO) > 0))) {
errorMessageList.put(UUID.randomUUID().toString(),new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的单位生育缴费数据,请勿重复导入!",infoVo));
continue;
......
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