|
|
|
@ -5,7 +5,9 @@ import java.io.IOException;
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
import java.util.HashMap;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFCell;
|
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
|
|
|
|
@ -152,7 +154,7 @@ public class ExcelOperation {
|
|
|
|
|
* @throws InstantiationException
|
|
|
|
|
* @throws IllegalAccessException
|
|
|
|
|
*/
|
|
|
|
|
public static List readExcel4Update(XSSFWorkbook workbook, int excelInitRow, int excelInitCell, String fileName, List<String> rowErr, Object obj, String... filter) throws InstantiationException, IllegalAccessException {
|
|
|
|
|
public static List readExcel4Update(XSSFWorkbook workbook, int excelInitRow, int excelInitCell, String fileName, List<HashMap<String, Object>> rowErr, Object obj, String... filter) throws InstantiationException, IllegalAccessException {
|
|
|
|
|
List<String> filters = new ArrayList<String>();
|
|
|
|
|
Class<?> classz = obj.getClass();
|
|
|
|
|
filters.addAll(Arrays.asList(filter));
|
|
|
|
@ -223,10 +225,21 @@ public class ExcelOperation {
|
|
|
|
|
}catch(Exception e){
|
|
|
|
|
isAddObj = false;
|
|
|
|
|
int errRownum = i+1;
|
|
|
|
|
String tmpErrString = fileName+" 第"+errRownum+"行信息有误,注意数字属性,该行请重新填写";
|
|
|
|
|
if (!rowErr.contains(tmpErrString)) {
|
|
|
|
|
rowErr.add(tmpErrString);
|
|
|
|
|
}
|
|
|
|
|
String name = fileName;
|
|
|
|
|
String value = " 第"+errRownum+"行信息有误,注意数字属性,该行请重新填写";
|
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
|
|
|
map.put("name", name);
|
|
|
|
|
map.put("value", value);
|
|
|
|
|
// boolean isadd = true;
|
|
|
|
|
// for (HashMap<String, Object> nameMap : rowErr) {
|
|
|
|
|
// if (nameMap.get("value").equals(name)) {
|
|
|
|
|
// isadd = false;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// if (isadd) {
|
|
|
|
|
rowErr.add((HashMap<String, Object>) map);
|
|
|
|
|
// }
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -234,10 +247,20 @@ public class ExcelOperation {
|
|
|
|
|
// 记录 excel中为空 的数据--且该条记录不记录进数据库
|
|
|
|
|
isAddObj = false;
|
|
|
|
|
int errRownum = i+1;
|
|
|
|
|
String tmpErrString = fileName+" 第"+errRownum+"行信息不完整,该行请重新填写";
|
|
|
|
|
if (!rowErr.contains(tmpErrString)) {
|
|
|
|
|
rowErr.add(tmpErrString);
|
|
|
|
|
}
|
|
|
|
|
String name = fileName;
|
|
|
|
|
String value = " 第"+errRownum+"行信息不完整,该行请重新填写";
|
|
|
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
|
|
|
map.put("name", name);
|
|
|
|
|
map.put("value", value);
|
|
|
|
|
// boolean isadd = true;
|
|
|
|
|
// for (HashMap<String, Object> nameMap : rowErr) {
|
|
|
|
|
// if (nameMap.get("value").equals(value)) {
|
|
|
|
|
// isadd = false;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// if (isadd) {
|
|
|
|
|
rowErr.add((HashMap<String, Object>) map);
|
|
|
|
|
// }
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|