文档库--详情中英文切换
This commit is contained in:
+16
-4
@@ -429,6 +429,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
}
|
}
|
||||||
List<Map<String, Object>> result = new ArrayList<>();
|
List<Map<String, Object>> result = new ArrayList<>();
|
||||||
for (OnlCgformArea onlCgformAreaTemp : areaList) {
|
for (OnlCgformArea onlCgformAreaTemp : areaList) {
|
||||||
|
String areaName = "";
|
||||||
|
if (CutEnum.CN.getValue().equals(cut)) {
|
||||||
|
areaName = onlCgformAreaTemp.getShowArea();
|
||||||
|
} else {
|
||||||
|
areaName = onlCgformAreaTemp.getEnName();
|
||||||
|
}
|
||||||
Map<String, Object> mapTemp = new HashMap<>();
|
Map<String, Object> mapTemp = new HashMap<>();
|
||||||
List<Map<String, Object>> resultTemp = new ArrayList<>();
|
List<Map<String, Object>> resultTemp = new ArrayList<>();
|
||||||
List<OnlCgformField> fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList());
|
List<OnlCgformField> fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList());
|
||||||
@@ -457,14 +463,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
for (OSSFile fileInfo : fileInfos) {
|
for (OSSFile fileInfo : fileInfos) {
|
||||||
Map<String, Object> mapNew = new HashMap<>();
|
Map<String, Object> mapNew = new HashMap<>();
|
||||||
mapNew.put("value", fileInfo);
|
mapNew.put("value", fileInfo);
|
||||||
mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
|
mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName);
|
||||||
resultTemp.add(mapNew);
|
resultTemp.add(mapNew);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (fileInfos.size() == 1) {
|
} else if (fileInfos.size() == 1) {
|
||||||
//单个文件处理
|
//单个文件处理
|
||||||
map.put("value", fileInfos.get(0));
|
map.put("value", fileInfos.get(0));
|
||||||
mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
|
mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName);
|
||||||
resultTemp.add(map);
|
resultTemp.add(map);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -491,13 +497,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
|
mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName);
|
||||||
}
|
}
|
||||||
if (map.size() != 0) {
|
if (map.size() != 0) {
|
||||||
resultTemp.add(map);
|
resultTemp.add(map);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mapTemp.put(onlCgformAreaTemp.getShowArea(), resultTemp);
|
if (CutEnum.CN.getValue().equals(cut)) {
|
||||||
|
areaName = onlCgformAreaTemp.getShowArea();
|
||||||
|
mapTemp.put(areaName, resultTemp);
|
||||||
|
} else {
|
||||||
|
areaName = onlCgformAreaTemp.getEnName();
|
||||||
|
mapTemp.put(areaName, resultTemp);
|
||||||
|
}
|
||||||
result.add(mapTemp);
|
result.add(mapTemp);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
Reference in New Issue
Block a user