Commit a72dfa64 authored by fangxinjiang's avatar fangxinjiang

批量办理 100%

parent 2c21b5f9
...@@ -1102,7 +1102,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1102,7 +1102,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setEmpNo(empVo.getEmpNo()); social.setEmpNo(empVo.getEmpNo());
} }
social.setEmpIdcard(excel.getEmpIdcard()); social.setEmpIdcard(excel.getEmpIdcard());
social.setBigailmentHandle(CommonConstants.ZERO_STRING); if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
social.setBigailmentHandle(null);
social.setBigailmentStart(null);
social.setCollectMoth(null);
}
social.setBirthHandle(CommonConstants.ZERO_STRING); social.setBirthHandle(CommonConstants.ZERO_STRING);
social.setMedicalHandle(CommonConstants.ZERO_STRING); social.setMedicalHandle(CommonConstants.ZERO_STRING);
social.setPensionHandle(CommonConstants.ZERO_STRING); social.setPensionHandle(CommonConstants.ZERO_STRING);
...@@ -1146,7 +1150,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1146,7 +1150,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setCollectMoth(socialSet.getCollectMoth()); social.setCollectMoth(socialSet.getCollectMoth());
social.setCollectType(socialSet.getCollectType()); social.setCollectType(socialSet.getCollectType());
social.setHaveThisMonth(socialSet.getHaveThisMonth()); social.setHaveThisMonth(socialSet.getHaveThisMonth());
if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
social.setInsuranceBigailment(socialSet.getInsuranceBigailment()); social.setInsuranceBigailment(socialSet.getInsuranceBigailment());
}
social.setInsuranceBirth(socialSet.getInsuranceBirth()); social.setInsuranceBirth(socialSet.getInsuranceBirth());
social.setInsuranceInjury(socialSet.getInsuranceInjury()); social.setInsuranceInjury(socialSet.getInsuranceInjury());
social.setInsuranceMedical(socialSet.getInsuranceMedical()); social.setInsuranceMedical(socialSet.getInsuranceMedical());
...@@ -1512,7 +1518,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1512,7 +1518,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(excel.getPensionCardinal()) if (Common.isNotNull(excel.getPensionCardinal())
&& BigDecimal.ZERO.compareTo(excel.getPensionCardinal()) != 0) { && BigDecimal.ZERO.compareTo(excel.getPensionCardinal()) != 0) {
// 有兼职工伤未派减不给增五险 // 有兼职工伤未派减不给增五险
if (BigDecimal.ZERO.compareTo(sf.getUnitPensionCardinal()) == 0 if (Common.isNotNull(sf.getSocialHousehold())
&& (Common.isEmpty(sf.getUnitPensionCardinal())
|| BigDecimal.ZERO.compareTo(sf.getUnitPensionCardinal()) == 0)
&& Common.isEmpty(sf.getSocialReduceStatus())) { && Common.isEmpty(sf.getSocialReduceStatus())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_INJURY_NOT_REDUCE))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_INJURY_NOT_REDUCE)));
return true; return true;
......
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