Merge pull request #628 from angrypandahu/v5-master

增加CellUtil Instant与Date一样的format 格式
This commit is contained in:
Golden Looly 2019-11-16 05:45:05 +08:00 committed by GitHub
commit 6b122734df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -17,6 +17,7 @@ import org.apache.poi.ss.util.RegionUtil;
import org.apache.poi.ss.util.SheetUtil;
import java.math.BigDecimal;
import java.time.Instant;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@ -159,6 +160,11 @@ public class CellUtil {
cell.setCellStyle(styleSet.getCellStyleForDate());
}
cell.setCellValue((Date) value);
} else if (value instanceof Instant) {
if (null != styleSet && null != styleSet.getCellStyleForDate()) {
cell.setCellStyle(styleSet.getCellStyleForDate());
}
cell.setCellValue(Date.from((Instant) value));
} else if (value instanceof Calendar) {
cell.setCellValue((Calendar) value);
} else if (value instanceof Boolean) {