Commit 526f6fdb authored by hongguangwu's avatar hongguangwu

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

parents b942ecf9 30b6f422
...@@ -615,6 +615,26 @@ public class TSocialInfo extends BaseEntity { ...@@ -615,6 +615,26 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty("社保是否可以补缴") @ExcelProperty("社保是否可以补缴")
private String canOverpayPension; private String canOverpayPension;
/**
* 社保补缴政策
*/
@Length(max = 500, message = "社保补缴政策 不能超过500个字符" )
@ExcelAttribute(name = "社保补缴政策", maxLength = 500)
@Schema(description = "社保补缴政策" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保补缴政策" )
private String payPolicyPension;
/**
* 医保补缴政策
*/
@Length(max = 500, message = "医保补缴政策 不能超过500个字符" )
@ExcelAttribute(name = "医保补缴政策", maxLength = 500)
@Schema(description = "医保补缴政策" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保补缴政策" )
private String payPolicyMedical;
/** /**
* 医保是否可以补缴: 0:是,1:否 * 医保是否可以补缴: 0:是,1:否
......
...@@ -1818,6 +1818,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1818,6 +1818,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
social.setCanOverpay(socialSet.getCanOverpay()); social.setCanOverpay(socialSet.getCanOverpay());
social.setCanOverpayPension(socialSet.getCanOverpayPension()); social.setCanOverpayPension(socialSet.getCanOverpayPension());
social.setPayPolicyPension(socialSet.getPayPolicyPension());
social.setPayPolicyMedical(socialSet.getPayPolicyMedical());
social.setCanOverpayMedical(socialSet.getCanOverpayMedical()); social.setCanOverpayMedical(socialSet.getCanOverpayMedical());
social.setCardinalId(socialSet.getId()); social.setCardinalId(socialSet.getId());
social.setSocialHousehold(socialSet.getDepartId()); social.setSocialHousehold(socialSet.getDepartId());
...@@ -3062,6 +3064,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3062,6 +3064,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return true; return true;
} }
if (Common.isNotNull(excel.getBigailmentStart()) if (Common.isNotNull(excel.getBigailmentStart())
&& CommonConstants.ZERO_STRING.equals(socialSet.getIsIllness())
&& ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getBigailmentStart()), && ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getBigailmentStart()),
socialSet.getCanOverpayMedical(), socialSet.getOverpayNumberMedical(), socialSet.getHaveThisMonthMedical())) { socialSet.getCanOverpayMedical(), socialSet.getOverpayNumberMedical(), socialSet.getHaveThisMonthMedical())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR)));
......
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