diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index 41223719..85305e31 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -4,7 +4,7 @@ insert into SAR_FILE_SPLIT_ITEMS_VAL - (id, type, item_id, valid_flag, creation_user, creation_time, modify_time, modify_user, display_seq, img_name, item_content, index_item) + (id, type, item_id, valid_flag, creation_user, creation_time, modify_time, modify_user, display_seq, img_name, item_content, translation, index_item) values ( #{item.id, jdbcType=VARCHAR}, #{item.type, jdbcType=VARCHAR}, @@ -14,6 +14,7 @@ #{item.modifyUser, jdbcType=VARCHAR}, #{item.displaySeq, jdbcType=INTEGER}, #{item.imgName, jdbcType=INTEGER}, #{item.itemContent, jdbcType=CLOB}, + #{item.translation, jdbcType=CLOB}, #{item.indexItem, jdbcType=INTEGER}) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index eef19607..8b7a581d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -465,6 +465,10 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { if (ITEM_CONTENT.equals(k)){ v = itemContentJoin(valList, (String) parameter.get(ID)); } + // 条文内容拼接 + if (TRANSLATION.equals(k)){ + v = translationJoin(valList, (String) parameter.get(ID)); + } // 条文解读 if (INTERPRETATION_ARTICLES.equals(k)){ v = articlesJoin(articlesList, (String) parameter.get(ID)); @@ -532,6 +536,42 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { return valContent.toString(); } + private String translationJoin(List valList, String itemId) { + StringBuilder valContent = new StringBuilder(); + if (!Objects.isNull(valList) && !valList.isEmpty()){ + int index = 0; + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : valList) { + String translation = sarFileSplitItemsValEO.getTranslation(); + // 条文内容拼接 + if (DocumentSplitCommon.TEXT.equals(sarFileSplitItemsValEO.getType())) { + if (StringUtils.isNotBlank(translation)){ + sarFileSplitItemsValEO.setTranslation(translation + .replace("<", "<").replace(">", ">")); + } + valContent.append("

").append(translation).append("

"); + } else if (DocumentSplitCommon.IMG.equals(sarFileSplitItemsValEO.getType())) { + valContent.append(""); + } else if (DocumentSplitCommon.TABLE.equals(sarFileSplitItemsValEO.getType())) { + valContent.append(translation); + } + + // 条目信息 + index += 1; + sarFileSplitItemsValEO.setId(UUIDUtils.randomUUID20()); + sarFileSplitItemsValEO.setItemId(itemId); + sarFileSplitItemsValEO.setDisplaySeq(index); + sarFileSplitItemsValEO.setValidFlag(0); + sarFileSplitItemsValEO.setCreationTime(new Date()); + sarFileSplitItemsValEO.setModifyTime(new Date()); + sarFileSplitItemsValEO.setCreationUser(sysUser.getId()); + sarFileSplitItemsValEO.setModifyUser(sysUser.getId()); + } + } + return valContent.toString(); + } + private String itemContentJoin(List valList, String itemId) { StringBuilder valContent = new StringBuilder(); if (!Objects.isNull(valList) && !valList.isEmpty()){