Commit c40ef474 authored by huyuchen's avatar huyuchen

优化修改

parent 370f1bf2
...@@ -513,10 +513,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -513,10 +513,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (!errorMessageList.isEmpty()) { if (!errorMessageList.isEmpty()) {
boolean isAllTrue = true; boolean isAllTrue = true;
for (ErrorDetailVO d : errorMessageList) { for (ErrorDetailVO d : errorMessageList) {
try {
if (Common.isEmpty(d.getResult()) || d.getResult() == 0) { if (Common.isEmpty(d.getResult()) || d.getResult() == 0) {
isAllTrue = false; isAllTrue = false;
break; break;
} }
} catch (Exception e) {
log.error("缴费库导入异常:" + e);
}
} }
if (isAllTrue) { if (isAllTrue) {
errorMessageList.clear(); errorMessageList.clear();
...@@ -2540,13 +2544,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2540,13 +2544,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
batchGsInsertList.put(UUID.randomUUID().toString(),payExists); batchGsInsertList.put(UUID.randomUUID().toString(),payExists);
} }
if (CommonConstants.ONE_STRING.equals(type)) { if (CommonConstants.ONE_STRING.equals(type)) {
payExists.setUnitMedicalMoney(infoVo.getUnitMedicalMoney()); payExists.setUnitMedicalMoney(null == infoVo.getUnitMedicalMoney() ? BigDecimal.ZERO : infoVo.getUnitMedicalMoney());
payExists.setPersonalMedicalMoney(infoVo.getPersonalMedicalMoney()); payExists.setPersonalMedicalMoney(null == infoVo.getPersonalMedicalMoney() ? BigDecimal.ZERO : infoVo.getPersonalMedicalMoney());
payExists.setUnitBigmailmentMoney(infoVo.getUnitBigailmentMoney()); payExists.setUnitBigmailmentMoney(null == infoVo.getUnitBigailmentMoney() ? BigDecimal.ZERO : infoVo.getUnitBigailmentMoney());
payExists.setUnitMedicalSet(infoVo.getMedicalSet()); payExists.setUnitMedicalSet(null == infoVo.getMedicalSet() ? BigDecimal.ZERO : infoVo.getMedicalSet());
payExists.setPersonalBigmailmentMoney(infoVo.getPersonalBigailmentMoney()); payExists.setPersonalBigmailmentMoney(null == infoVo.getPersonalBigailmentMoney() ? BigDecimal.ZERO : infoVo.getPersonalBigailmentMoney());
payExists.setSocialSecurityNo(infoVo.getSocialSecurityNo()); payExists.setSocialSecurityNo(null == infoVo.getSocialSecurityNo() ? "" : infoVo.getSocialSecurityNo());
payExists.setUnitSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitMedicalMoney() payExists.setUnitSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitMedicalMoney()
, payExists.getUnitBigmailmentMoney() , payExists.getUnitBigmailmentMoney()
, payExists.getUnitSocialSum())); , payExists.getUnitSocialSum()));
...@@ -2561,7 +2564,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2561,7 +2564,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists.getSocialHousehold(), payExists.getSocialHousehold(),
payExists.getProvidentHousehold(), infoVo.getEmpName(), payExists.getProvidentHousehold(), infoVo.getEmpName(),
"对应员工身份证" + infoVo.getEmpIdcard() + CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN)); "对应员工身份证" + infoVo.getEmpIdcard() + CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN));
continue;
} }
} }
return errorMessageList; return errorMessageList;
......
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