Commit bd83ba20 authored by fangxinjiang's avatar fangxinjiang

优化-fxj

parent c2ddb824
...@@ -3077,7 +3077,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3077,7 +3077,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return true; return true;
} }
// 其他 只用判断对应养老基数和时间 与合同时间 即可 // 其他 只用判断对应养老基数和时间 与合同时间 即可
if (!CommonConstants.ONE_STRING.equals(excel.getPaymentType()) && Common.isEmpty(excel.getTrustRemark()) if (Common.isEmpty(excel.getTrustRemark()) && !Common.isEmpty(excel.getPensionStart())
&& !DateUtil.formatDatePatten(temp, DateUtil.DATETIME_YYYYMM).equals(DateUtil.formatDatePatten(excel.getPensionStart(), DateUtil.DATETIME_YYYYMM)) && !DateUtil.formatDatePatten(temp, DateUtil.DATETIME_YYYYMM).equals(DateUtil.formatDatePatten(excel.getPensionStart(), DateUtil.DATETIME_YYYYMM))
) { ) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR2))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR2)));
......
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