From ebef3dc7654c75992fd03212f316393047e04d06 Mon Sep 17 00:00:00 2001 From: jueyue Date: Mon, 14 May 2018 17:16:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AFexcel=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/imports/ExcelImportService.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/ExcelImportService.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/ExcelImportService.java index 84f6db8..4d9e728 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/ExcelImportService.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/ExcelImportService.java @@ -1,11 +1,11 @@ /** * Copyright 2013-2015 JueYue (qrb.jueyue@gmail.com) - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at - * + *

* http://www.apache.org/licenses/LICENSE-2.0 - * + *

* Unless required by applicable law or agreed to in writing, software distributed under the License * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express * or implied. See the License for the specific language governing permissions and limitations under @@ -107,8 +107,8 @@ public class ExcelImportService extends ImportBaseService { Collection collection = (Collection) PoiReflectorUtil.fromCache(object.getClass()) .getValue(object, param.getName()); Object entity = PoiPublicUtil.createObject(param.getType(), targetId); - if(entity instanceof IExcelDataModel) { - ((IExcelDataModel)entity).setRowNum(row.getRowNum()); + if (entity instanceof IExcelDataModel) { + ((IExcelDataModel) entity).setRowNum(row.getRowNum()); } String picId; boolean isUsed = false;// 是否需要加上这个对象 @@ -176,7 +176,7 @@ public class ExcelImportService extends ImportBaseService { for (int j = 0; j < params.getTitleRows(); j++) { rows.next(); } - Map titlemap = getTitleMap(rows, params, excelCollection,excelParams); + Map titlemap = getTitleMap(rows, params, excelCollection, excelParams); checkIsValidTemplate(titlemap, excelParams, params, excelCollection); Row row = null; Object object = null; @@ -187,7 +187,7 @@ public class ExcelImportService extends ImportBaseService { rows.next(); } //判断index 和集合,集合情况默认为第一列 - if (excelCollection.size() > 0 && params.getKeyIndex() == null) { + if (excelCollection.size() > 0 && params.getKeyIndex() == null) { params.setKeyIndex(0); } while (rows.hasNext() @@ -214,7 +214,7 @@ public class ExcelImportService extends ImportBaseService { object = PoiPublicUtil.createObject(pojoClass, targetId); try { Set keys = titlemap.keySet(); - for (Integer cn:keys) { + for (Integer cn : keys) { Cell cell = row.getCell(cn); String titleString = (String) titlemap.get(cn); if (excelParams.containsKey(titleString) || Map.class.equals(pojoClass)) { @@ -231,8 +231,8 @@ public class ExcelImportService extends ImportBaseService { //for (int i = row.getFirstCellNum(), le = titlemap.size(); i < le; i++) { //} - if(object instanceof IExcelDataModel) { - ((IExcelDataModel)object).setRowNum(row.getRowNum()); + if (object instanceof IExcelDataModel) { + ((IExcelDataModel) object).setRowNum(row.getRowNum()); } for (ExcelCollectionParams param : excelCollection) { addListContinue(object, param, row, titlemap, targetId, pictures, params); @@ -348,10 +348,10 @@ public class ExcelImportService extends ImportBaseService { // 处理指定列的情况 Set keys = excelParams.keySet(); - for (String key : keys){ - if (key.startsWith("FIXED_")){ - String [] arr = key.split("_"); - titlemap.put(Integer.parseInt(arr[1]),key); + for (String key : keys) { + if (key.startsWith("FIXED_")) { + String[] arr = key.split("_"); + titlemap.put(Integer.parseInt(arr[1]), key); } } return titlemap; @@ -450,7 +450,8 @@ public class ExcelImportService extends ImportBaseService { if (rowList.get(j).getRowNum() < rowList.get(j).getSheet().getLastRowNum()) { book.getSheetAt(i).shiftRows(rowList.get(j).getRowNum() + 1, rowList.get(j).getSheet().getLastRowNum(), -1); } else if (rowList.get(j).getRowNum() == rowList.get(j).getSheet().getLastRowNum()) { - book.getSheetAt(i).shiftRows(rowList.get(j).getRowNum(), rowList.get(j).getSheet().getLastRowNum(), -1); + book.getSheetAt(i).createRow(rowList.get(j).getRowNum() + 1); + book.getSheetAt(i).shiftRows(rowList.get(j).getRowNum() + 1, rowList.get(j).getSheet().getLastRowNum() + 1, -1); } } } @@ -566,7 +567,6 @@ public class ExcelImportService extends ImportBaseService { } /** - * * @param object * @param picId * @param excelParams