Commit 18a60fa1 authored by hongguangwu's avatar hongguangwu

MVP1.7.12-导入

parent 0cbaf2c6
......@@ -761,6 +761,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
private static final String WORK_LOCATION2 = "安徽省合肥市区域";
private static final String YEAR_BONUS = "个月";
private static final String KONG_STR = "";
private static final String EXP_ENTRY_DATE = "yyyy年M月d日";
/**
* 插入excel bad record
*/
......@@ -777,8 +778,16 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
}
}
if (Common.isNotNull(excel.getExpEntry())) {
Date expEntryDate;
try {
insert.setExpEntryDate(DateUtil.stringToDate2(excel.getExpEntry(), null));
// 将2025年6月3日 转化为date格式日期
expEntryDate = DateUtil.stringToDateByFormat(excel.getExpEntry(), EXP_ENTRY_DATE);
if (expEntryDate == null) {
expEntryDate = DateUtil.stringToDate2(excel.getExpEntry(), KONG_STR);
}
if (expEntryDate != null) {
insert.setExpEntryDate(expEntryDate);
}
} catch (Exception e) {
// 错误格式,不转化
}
......
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