center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #9384 from ulleo/dev

Browse Source 
feat(X-Pack): 数据填报批量上传数据增加下拉框，多选框数据选项匹配校验
This commit is contained in:
ulleo 2024-04-26 18:19:41 +08:00 committed by GitHub
commit e4b0cc11fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java
View File

@ -721,7 +721,19 @@ public class DataFillDataService {
rowData.put(field.getSettings().getMapping().getColumnName(), time);
break;
default:
if (StringUtils.equalsIgnoreCase(field.getType(), "checkbox") ||
if (StringUtils.equalsIgnoreCase(field.getType(), "select") && !field.getSettings().isMultiple()) {
boolean has = false;
for (ExtTableField.Option option : field.getSettings().getOptions()) {
if (StringUtils.equals((String) option.getValue(), excelRowData)) {
has = true;
break;
}
}
if (!has) {
DataEaseException.throwException("[" + field.getSettings().getName() + "] 值: " + excelRowData + " 不在范围内");
}
rowData.put(field.getSettings().getMapping().getColumnName(), excelRowData);
} else if (StringUtils.equalsIgnoreCase(field.getType(), "checkbox") ||
StringUtils.equalsIgnoreCase(field.getType(), "select") && field.getSettings().isMultiple()) {
List<String> list = new ArrayList<>();
String[] strArr = excelRowData.split(";");
@ -735,7 +747,27 @@ public class DataFillDataService {
DataEaseException.throwException("[" + field.getSettings().getName() + "] 不能为空");
}
}
rowData.put(field.getSettings().getMapping().getColumnName(), gson.toJson(list));
List<String> result = new ArrayList<>();
if (CollectionUtils.isNotEmpty(list)) {
for (String str : list) {
boolean has = false;
for (ExtTableField.Option option : field.getSettings().getOptions()) {
if (StringUtils.equals((String) option.getValue(), str)) {
has = true;
break;
}
}
if (has) {
result.add(str);
}
}
if (CollectionUtils.isEmpty(result)) {
DataEaseException.throwException("[" + field.getSettings().getName() + "] 输入值不在范围内");
}
}
rowData.put(field.getSettings().getMapping().getColumnName(), gson.toJson(result));
} else {
//校验手机号，校验邮箱格式
if (StringUtils.equalsAnyIgnoreCase(field.getSettings().getInputType(), "tel")) {