From 962360971410542d5744e285c33bc8be06f7a138 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 14 Aug 2024 15:10:41 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B):=20?= =?UTF-8?q?=E8=AF=91=E6=96=87=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessStandardInterpretClause.java | 4 ++++ .../ProcessStandardInterpretClauseSublist.java | 1 + .../xml/ProcessStandardInterpretClauseMapper.xml | 1 + .../impl/StandardInterpretFlowServiceImpl.java | 14 ++++++++++++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java index b48a6c88..38f14f31 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java @@ -41,6 +41,10 @@ public class ProcessStandardInterpretClause extends BaseEntity { @TableField(exist = false) @Excel(name = "条款内容", width = 15) private String itemContent; + /**译文*/ + @ApiModelProperty(value = "译文") + @TableField(exist = false) + private String translation; /**各涉及部门解读人*/ @ApiModelProperty(value = "各涉及部门解读人") @Excel(name = "各涉及部门解读人", width = 18, dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java index 362cae0c..9d2bdd8f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java @@ -51,6 +51,7 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity { /**译文*/ @ApiModelProperty(value = "译文") @Excel(name = "译文", width = 15) + @TableField(exist = false) private String translation; /**是否与上一版相同（字典：1：是，0：否）*/ @ApiModelProperty(value = "是否与上一版相同（字典：1：是，0：否）") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml index a448e753..208d3216 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml @@ -8,6 +8,7 @@ IF(lds.id is not null, lds.standard_number, lds2.item_num) itemNum, IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle, IF(lds.id is not null, null, lds2.item_content) itemContent, + lds2.translation, standard_interpret_id, psic.clause_id, interpret_person_ids, diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index 5507ba59..698997a0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -468,8 +468,6 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe // 合并 first.setInterpretPersonId(mergeString(first.getInterpretPersonId(), standardInterpretClauseSublist.getInterpretPersonId())); -// first.setTranslation(mergeString(first.getTranslation(), -// standardInterpretClauseSublist.getTranslation())); first.setIsSameAsPrevVersion(mergeString(first.getIsSameAsPrevVersion(), standardInterpretClauseSublist.getIsSameAsPrevVersion())); first.setChangeDescription(mergeString(first.getChangeDescription(), @@ -748,6 +746,10 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe .map(SarFileSplitItemsValEO::getItemContent) .collect(Collectors.joining("\n\r")); processStandardInterpretClause.setItemContent(itemContents); + String translation = sarFileSplitItemsValEOS.stream() + .map(SarFileSplitItemsValEO::getTranslation) + .collect(Collectors.joining("\n\r")); + processStandardInterpretClause.setTranslation(translation); } } @@ -862,6 +864,10 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe .map(SarFileSplitItemsValEO::getItemContent) .collect(Collectors.joining("\n\r")); processStandardInterpretClauseSublist.setItemContent(itemContents); + String translation = sarFileSplitItemsValEOS.stream() + .map(SarFileSplitItemsValEO::getTranslation) + .collect(Collectors.joining("\n\r")); + processStandardInterpretClauseSublist.setTranslation(translation); } } }else { @@ -890,6 +896,10 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe .map(SarFileSplitItemsValEO::getItemContent) .collect(Collectors.joining("\n\r")); processStandardInterpretClause.setItemContent(itemContents); + String translation = sarFileSplitItemsValEOS.stream() + .map(SarFileSplitItemsValEO::getTranslation) + .collect(Collectors.joining("\n\r")); + processStandardInterpretClause.setTranslation(translation); } }