拆分导入问题修改
This commit is contained in:
+3
-3
@@ -3119,10 +3119,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
.sorted(Comparator.comparing(OnlCgformField::getOrderNum)) // 必须按顺序 才能导出时表头和数据一致
|
.sorted(Comparator.comparing(OnlCgformField::getOrderNum)) // 必须按顺序 才能导出时表头和数据一致
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
List<String> fieldForExport = new ArrayList<>();
|
List<String> fieldForExport = new ArrayList<>();
|
||||||
if (CutEnum.CN.getValue().equals(cut)){
|
if (CutEnum.EN.getValue().equals(cut)){
|
||||||
fieldForExport = fieldList.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList());
|
|
||||||
} else {
|
|
||||||
fieldForExport = fieldList.stream().map(OnlCgformField::getDbFieldEnName).collect(Collectors.toList());
|
fieldForExport = fieldList.stream().map(OnlCgformField::getDbFieldEnName).collect(Collectors.toList());
|
||||||
|
} else {
|
||||||
|
fieldForExport = fieldList.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
return StringUtils.join(fieldForExport, ",").split(",");
|
return StringUtils.join(fieldForExport, ",").split(",");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -137,7 +137,7 @@
|
|||||||
OperationList:[],
|
OperationList:[],
|
||||||
upload1:this.$t('upload1'),
|
upload1:this.$t('upload1'),
|
||||||
// accept:'application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/msword',
|
// accept:'application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/msword',
|
||||||
accept:'application/zip',
|
accept:'application/x-zip-compressed',
|
||||||
rows:[],
|
rows:[],
|
||||||
token:Vue.ls.get(ACCESS_TOKEN),
|
token:Vue.ls.get(ACCESS_TOKEN),
|
||||||
flag:false, //提交表单标识
|
flag:false, //提交表单标识
|
||||||
|
|||||||
Reference in New Issue
Block a user