|
|
|
@ -6,7 +6,6 @@ import java.io.OutputStream;
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
|
|
import java.lang.reflect.Method;
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import java.text.DecimalFormat;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
import java.util.Comparator;
|
|
|
|
@ -194,7 +193,10 @@ public class ExcelUtil<T>
|
|
|
|
|
// 设置类的私有字段属性可访问.
|
|
|
|
|
field.setAccessible(true);
|
|
|
|
|
Integer column = cellMap.get(attr.name());
|
|
|
|
|
fieldsMap.put(column, field);
|
|
|
|
|
if (column != null)
|
|
|
|
|
{
|
|
|
|
|
fieldsMap.put(column, field);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for (int i = 1; i < rows; i++)
|
|
|
|
@ -829,14 +831,7 @@ public class ExcelUtil<T>
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if ((Double) val % 1 > 0)
|
|
|
|
|
{
|
|
|
|
|
val = new DecimalFormat("0.00").format(val);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
val = new DecimalFormat("0").format(val);
|
|
|
|
|
}
|
|
|
|
|
val = new BigDecimal(val.toString()); // 浮点格式处理
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (cell.getCellTypeEnum() == CellType.STRING)
|
|
|
|
|