diff --git a/WebRoot/Excel/b9018e0b-db5a-4a81-b72e-f99d61b79b13.xlsx b/WebRoot/Excel/b9018e0b-db5a-4a81-b72e-f99d61b79b13.xlsx new file mode 100644 index 00000000..7958379d Binary files /dev/null and b/WebRoot/Excel/b9018e0b-db5a-4a81-b72e-f99d61b79b13.xlsx differ diff --git a/WebRoot/Excel/d162284c-bc85-4180-9bb8-6e2b25cde5ce.xlsx b/WebRoot/Excel/d162284c-bc85-4180-9bb8-6e2b25cde5ce.xlsx new file mode 100644 index 00000000..7958379d Binary files /dev/null and b/WebRoot/Excel/d162284c-bc85-4180-9bb8-6e2b25cde5ce.xlsx differ diff --git a/WebRoot/Excel/ee6e08a4-edc4-4c1b-89e1-eb7bacaf00a3.xlsx b/WebRoot/Excel/ee6e08a4-edc4-4c1b-89e1-eb7bacaf00a3.xlsx new file mode 100644 index 00000000..7958379d Binary files /dev/null and b/WebRoot/Excel/ee6e08a4-edc4-4c1b-89e1-eb7bacaf00a3.xlsx differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index 62ec0db8..ec363849 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -74,7 +74,7 @@ public class CollectController extends Controller { renderJson(CommonUtil.returnMessageJson(false, "上传文件类型错误!系统只允许上传xlsx格式!")); return; } - //判断文件大小大于20b则返回错误信息,并终止上传,删除上传文件 + //判断文件大小大于2mb则返回错误信息,并终止上传,删除上传文件 long size = excelFile.getFile().length(); if (size > 1024 * 1024 * 2) { Map map = new HashMap<>(); diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index 36a3a2af..f9d7fd36 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -216,7 +216,6 @@ public class CollectModel { } - /** * 功能:检查当前登录人员是不是有发布任务的角色 * @@ -618,12 +617,22 @@ public class CollectModel { List list = new ArrayList<>(); String column_name, original_name; + Set _set = new HashSet<>(); for (int colNum = 0; colNum < ed.getLastCellNum(); colNum++) { if (StrKit.isBlank(ed.getCell(colNum).toString())) {//下面没有,应该听上面的 original_name = CommonUtil.removeKuoHao(st.getCell(colNum).toString().replace("\n", "")); column_name = ChineseCharacterUtil.getColumnNameByMemo(CommonUtil.removeKuoHao(st.getCell(colNum).toString())); Record record = new Record(); record.set("original_name", original_name); + + //如果发现字段名称重复,则不断尝试加1,直到找出不重复的字段名称 + int idx = 1; + while (_set.contains(column_name)) { + column_name += idx; + idx++; + } + _set.add(column_name); + record.set("column_name", column_name); list.add(record); } else { @@ -637,7 +646,14 @@ public class CollectModel { original_name = st.getCell(k).toString().replace("\n", "") + "_" + ed.getCell(colNum).toString().replace("\n", ""); column_name = ChineseCharacterUtil.getColumnNameByMemo(CommonUtil.removeKuoHao(st.getCell(k).toString())) + "_" + ChineseCharacterUtil.getColumnNameByMemo(CommonUtil.removeKuoHao(ed.getCell(colNum).toString())); } - + //如果发现字段名称重复,则不断尝试加1,直到找出不重复的字段名称 + int idx = 1; + while (_set.contains(column_name)) { + column_name += idx; + idx++; + } + _set.add(column_name); + Record record = new Record(); record.set("original_name", original_name); record.set("column_name", column_name.toLowerCase());