Commit e6dae7ab authored by hongguangwu's avatar hongguangwu

MVP1.7.0 优化

parent 5c6ed2ef
......@@ -623,12 +623,16 @@ public class DiyExcelImportUtil implements Serializable {
if (Common.isNotNull(attr.dateFormat())) {
format = attr.dateFormat();
}
dateValue = DateUtil.stringDateFormat(c.trim(), format);
if (null == dateValue) {
if ("taxMonth".equals(shuName) && c.length() != 6) {
errorFormat.append(attr.name()).append(";");
} else {
startDateMap.put(shuName, dateValue);
tempStr = c.trim();
dateValue = DateUtil.stringDateFormat(c.trim(), format);
if (null == dateValue) {
errorFormat.append(attr.name()).append(";");
} else {
startDateMap.put(shuName, dateValue);
tempStr = c.trim();
}
}
}
}
......
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