Commit dfa007d9 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/develop' into develop

parents 6afc0e7f 0bc24fe9
...@@ -168,6 +168,15 @@ public class ValidityUtil { ...@@ -168,6 +168,15 @@ public class ValidityUtil {
if(!money.matches(ValidityConstants.POSITIVE_INTEGER_PATTERN_TWO_FLOAT)){ if(!money.matches(ValidityConstants.POSITIVE_INTEGER_PATTERN_TWO_FLOAT)){
return Boolean.FALSE ; return Boolean.FALSE ;
} }
BigDecimal bigDecimalMoney= new BigDecimal(money);
boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >0;
if(max){
return Boolean.FALSE ;
}
boolean min = bigDecimalMoney.compareTo(CommonConstants.MONEY_MIN) <=0;
if(min){
return Boolean.FALSE ;
}
return Boolean.TRUE; return Boolean.TRUE;
} }
......
...@@ -2762,6 +2762,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2762,6 +2762,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (!BigDecimalUtils.isNullOrZero(actualPremium)){ if (!BigDecimalUtils.isNullOrZero(actualPremium)){
//变更后为单独结算 //变更后为单独结算
if(CommonConstants.ONE_INT == newSettleType){ if(CommonConstants.ONE_INT == newSettleType){
//根据旧的结算id获取旧的结算信息
TInsuranceSettle byId = tInsuranceSettleService.getById(defaultSettleId);
//如果已经推送过实际保费,则先作废,再推送新的实际保费
if (byId.getIsActualPush() ==CommonConstants.ONE_INT){
//作废旧的数据,生成作废结算信息记录 //作废旧的数据,生成作废结算信息记录
TInsuranceSettleCancel cancel = new TInsuranceSettleCancel(); TInsuranceSettleCancel cancel = new TInsuranceSettleCancel();
cancel.setDeptNo(success.getOldDeptNo()); cancel.setDeptNo(success.getOldDeptNo());
...@@ -2770,17 +2774,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2770,17 +2774,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
cancel.setCreateUesr(user.getId()); cancel.setCreateUesr(user.getId());
cancel.setCreateTime(LocalDateTime.now()); cancel.setCreateTime(LocalDateTime.now());
tInsuranceSettleCancelService.save(cancel); tInsuranceSettleCancelService.save(cancel);
//推送EKP // TODO: 2022/8/2 //生成新的结算信息
TInsuranceSettle byId = tInsuranceSettleService.getById(defaultSettleId);
//如果已经推送过实际保费,则先作废,再推送新的预估保费和实际保费
if (byId.getIsActualPush() ==CommonConstants.ONE_INT){
}
if(byId.getIsActualPush() ==CommonConstants.ZERO_INT){
}
//新增新的结算数据
TInsuranceSettle newInsuranceSettle = new TInsuranceSettle(); TInsuranceSettle newInsuranceSettle = new TInsuranceSettle();
newInsuranceSettle.setInsDetailId(insuranceDetailId); newInsuranceSettle.setInsDetailId(insuranceDetailId);
newInsuranceSettle.setSettleType(newSettleType); newInsuranceSettle.setSettleType(newSettleType);
...@@ -2790,9 +2784,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2790,9 +2784,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
newInsuranceSettle.setCreateTime(LocalDateTime.now()); newInsuranceSettle.setCreateTime(LocalDateTime.now());
newInsuranceSettle.setActualPremium(success.getActualPremium()); newInsuranceSettle.setActualPremium(success.getActualPremium());
tInsuranceSettleService.save(newInsuranceSettle); tInsuranceSettleService.save(newInsuranceSettle);
//赋值新的预估费用和新的结算信息 //赋值新的结算信息id
updateWrapper.set(TInsuranceDetail :: getDefaultSettleId,newInsuranceSettle.getId()); updateWrapper.set(TInsuranceDetail :: getDefaultSettleId,newInsuranceSettle.getId());
update(updateWrapper); update(updateWrapper);
//推送至EKP执行作废操作
//作废成功后推送新的 TODO: 2022/8/2
}
//如果没有推送过实际保费
if(byId.getIsActualPush() ==CommonConstants.ZERO_INT){
//推送新的至EKP
}
} }
//变更后为合并结算 //变更后为合并结算
if(CommonConstants.ZERO_INT == newSettleType){ if(CommonConstants.ZERO_INT == newSettleType){
......
...@@ -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