Commit 97ebb8fb authored by hongguangwu's avatar hongguangwu

MVP1.5.4-派单委托备注(合同起缴日期等)

parent 7ad8575f
......@@ -2252,7 +2252,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isEmpty(empVo.getContractName()) && validContractInfo(errorMessageList,excel)) {
return true;
}
if (Common.isNotNull(empVo.getContractStart())) {
if (Common.isNotNull(empVo.getContractStart()) && Common.isNotNull(excel.getContractStart())) {
// 系统已存在的合同起缴日期
String conYearMonthDay = DateUtil.formatDatePatten(empVo.getContractStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT);
String excelConYearMonthDay = DateUtil.formatDatePatten(excel.getContractStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT);
......
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