) sarFileSplitItemsEO.get("itemValEOList");
String itemConditions = "";
+ String itemConditionsTranslation = "";
int ind = 1;
if (getValList != null && !getValList.isEmpty()) {
for (SarFileSplitItemsValEO valEO : getValList) {
+ String type = valEO.getType();
+ String itemContent = valEO.getItemContent();
+ String translation = valEO.getTranslation();
// 当前段内容
String valContent = "";
- if ("TEXT".equals(valEO.getType())) {
- valContent += "" + valEO.getItemContent() + "
";
- } else if ("IMG".equals(valEO.getType())) {
- valContent += "
";
-// valContent += valEO.getItemContent();
- } else if ("TABLE".equals(valEO.getType())) {
- valContent += valEO.getItemContent();
+ String valContentTranslation = "";
+ if ("TEXT".equals(type)) {
+ valContent += "" + itemContent + "
";
+ if (StringUtils.isNotBlank(translation)){
+ valContentTranslation += "" + translation + "
";
+ }
+ } else if ("IMG".equals(type)) {
+ valContent += "
";
+ if (StringUtils.isNotBlank(translation)){
+ valContentTranslation += "
";
+ }
+ } else if ("TABLE".equals(type)) {
+ valContent += itemContent;
+ if (StringUtils.isNotBlank(translation)){
+ valContentTranslation += translation;
+ }
}
itemConditions += valContent;
+ itemConditionsTranslation += valContentTranslation;
// val表信息
valEO.setId(UUIDUtils.randomUUID20());
// valEO.setItemId(itemsId);
@@ -2978,6 +2968,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl