Browse Source

最后忽略行数的bug

4.1.3.A
jueyue 9 years ago
parent
commit
e24d10d6e1
2 changed files with 10 additions and 9 deletions
  1. +8
    -8
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ImportParams.java
  2. +2
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java

+ 8
- 8
easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ImportParams.java View File

@@ -28,32 +28,32 @@ public class ImportParams extends ExcelBaseParams {
/**
* 表格标题行数,默认0
*/
private int titleRows = 0;
private int titleRows = 0;
/**
* 表头行数,默认1
*/
private int headRows = 1;
private int headRows = 1;
/**
* 字段真正值和列标题之间的距离 默认0
*/
private int startRows = 0;
private int startRows = 0;
/**
* 主键设置,如何这个cell没有值,就跳过 或者认为这个是list的下面的值
*/
private int keyIndex = 0;
private int keyIndex = 0;
/**
* 上传表格需要读取的sheet 数量,默认为1
*/
private int sheetNum = 1;
private int sheetNum = 1;
/**
* 是否需要保存上传的Excel,默认为false
*/
private boolean needSave = false;
private boolean needSave = false;
/**
* 保存上传的Excel目录,默认是 如 TestEntity这个类保存路径就是
* upload/excelUpload/Test/yyyyMMddHHmss_***** 保存名称上传时间_五位随机数
*/
private String saveUrl = "upload/excelUpload";
private String saveUrl = "upload/excelUpload";
/**
* 校验处理接口
*/
@@ -61,7 +61,7 @@ public class ImportParams extends ExcelBaseParams {
/**
* 最后的无效行数
*/
private int lastOfInvalidRow;
private int lastOfInvalidRow = 0;
public int getHeadRows() {
return headRows;


+ 2
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java View File

@@ -192,7 +192,8 @@ public class ExcelImportServer extends ImportBaseService {
Object object = null;
String picId;
while (rows.hasNext()
&& sheet.getLastRowNum() - row.getRowNum() > params.getLastOfInvalidRow()) {
&& (row == null || sheet.getLastRowNum() - row.getRowNum() > params
.getLastOfInvalidRow())) {
row = rows.next();
// 判断是集合元素还是不是集合元素,如果是就继续加入这个集合,不是就创建新的对象
if ((row.getCell(params.getKeyIndex()) == null || StringUtils.isEmpty(getKeyValue(row


Loading…
Cancel
Save