批量办理 100%

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -1102,7 +1102,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				social.setEmpNo(empVo.getEmpNo());
 			}
 			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.setMedicalHandle(CommonConstants.ZERO_STRING);
 			social.setPensionHandle(CommonConstants.ZERO_STRING);
@@ -1146,7 +1150,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				social.setCollectMoth(socialSet.getCollectMoth());
 				social.setCollectType(socialSet.getCollectType());
 				social.setHaveThisMonth(socialSet.getHaveThisMonth());
-				social.setInsuranceBigailment(socialSet.getInsuranceBigailment());
+				if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
+					social.setInsuranceBigailment(socialSet.getInsuranceBigailment());
+				}
 				social.setInsuranceBirth(socialSet.getInsuranceBirth());
 				social.setInsuranceInjury(socialSet.getInsuranceInjury());
 				social.setInsuranceMedical(socialSet.getInsuranceMedical());
@@ -1512,7 +1518,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				if (Common.isNotNull(excel.getPensionCardinal())
 						&& 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())) {
 						errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_INJURY_NOT_REDUCE)));
 						return true;