1
This commit is contained in:
+3
-2
@@ -8,6 +8,7 @@ import com.ruoyi.jarvis.util.QuickRecordModelShopOptionUtil;
|
|||||||
import org.apache.poi.ss.usermodel.BorderStyle;
|
import org.apache.poi.ss.usermodel.BorderStyle;
|
||||||
import org.apache.poi.ss.usermodel.Cell;
|
import org.apache.poi.ss.usermodel.Cell;
|
||||||
import org.apache.poi.ss.usermodel.CellStyle;
|
import org.apache.poi.ss.usermodel.CellStyle;
|
||||||
|
import org.apache.poi.ss.usermodel.CellType;
|
||||||
import org.apache.poi.ss.usermodel.DataFormatter;
|
import org.apache.poi.ss.usermodel.DataFormatter;
|
||||||
import org.apache.poi.ss.usermodel.DateUtil;
|
import org.apache.poi.ss.usermodel.DateUtil;
|
||||||
import org.apache.poi.ss.usermodel.FillPatternType;
|
import org.apache.poi.ss.usermodel.FillPatternType;
|
||||||
@@ -371,10 +372,10 @@ public class RebateSheetConvertService {
|
|||||||
|
|
||||||
private static boolean isExcelDateCell(Cell cell) {
|
private static boolean isExcelDateCell(Cell cell) {
|
||||||
CellType type = cell.getCellType();
|
CellType type = cell.getCellType();
|
||||||
if (type == org.apache.poi.ss.usermodel.CellType.FORMULA) {
|
if (type == CellType.FORMULA) {
|
||||||
type = cell.getCachedFormulaResultType();
|
type = cell.getCachedFormulaResultType();
|
||||||
}
|
}
|
||||||
return type == org.apache.poi.ss.usermodel.CellType.NUMERIC && DateUtil.isCellDateFormatted(cell);
|
return type == CellType.NUMERIC && DateUtil.isCellDateFormatted(cell);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String formatKeptDate(Cell cell) {
|
private static String formatKeptDate(Cell cell) {
|
||||||
|
|||||||
Reference in New Issue
Block a user