修复日期问题
This commit is contained in:
parent
79cfa0cbc0
commit
8bf2cda7c3
|
|
@ -397,7 +397,8 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee
|
|||
}
|
||||
}
|
||||
} else if (StringUtils.equals(dataKey, SalaryI18nUtil.getI18nLabel(0, "首次入境时间"))) {
|
||||
if (StringUtils.isNotBlank(dataValue) && dataValue.length() >= 10) {
|
||||
if (StringUtils.isNotBlank(dataValue)) {
|
||||
if (dataValue.length() >= 10) {
|
||||
dataValue = dataValue.substring(0, 10);
|
||||
}
|
||||
if (!SalaryDateUtil.checkDay(dataValue)) {
|
||||
|
|
@ -408,7 +409,9 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee
|
|||
} else {
|
||||
employeeDeclareExcel.setEntryDate(SalaryDateUtil.dateStrToLocalDate(dataValue));
|
||||
}
|
||||
}
|
||||
} else if (StringUtils.equals(dataKey, SalaryI18nUtil.getI18nLabel(0, "预计离境时间"))) {
|
||||
if (StringUtils.isNotBlank(dataValue)) {
|
||||
if (StringUtils.isNotBlank(dataValue) && dataValue.length() >= 10) {
|
||||
dataValue = dataValue.substring(0, 10);
|
||||
}
|
||||
|
|
@ -420,6 +423,7 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee
|
|||
} else {
|
||||
employeeDeclareExcel.setDepartureDate(SalaryDateUtil.dateStrToLocalDate(dataValue));
|
||||
}
|
||||
}
|
||||
} else if (StringUtils.equals(dataKey, SalaryI18nUtil.getI18nLabel(0, "涉税事由"))) {
|
||||
employeeDeclareExcel.setTaxReasons(dataValue);
|
||||
} else if (StringUtils.equals(dataKey, SalaryI18nUtil.getI18nLabel(0, "是否残疾"))) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue