diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml index 9dbfa1d2..7d9f8fa9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml @@ -9,7 +9,7 @@ standard_interpret_clause_id, clause_id, interpret_person_id, - `translation`, + psic2.translation is_same_as_prev_version, change_description, regulatory_notes, @@ -50,6 +50,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 from process_standard_interpret_clause psic left join laws_domestic_standard lds on psic.clause_id = lds.id and lds.del_flag = 0 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 9df0f702..5507ba59 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 @@ -256,6 +256,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe lawsDocumentSplit.setItemNum(null); lawsDocumentSplit.setItemTitle(null); lawsDocumentSplit.setItemContent(null); + lawsDocumentSplit.setTranslation(null); LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.getById(standardInterpretClauseSublist.getClauseId()); if (!Objects.isNull(lawsDomesticStandard)){ @@ -467,8 +468,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe // 合并 first.setInterpretPersonId(mergeString(first.getInterpretPersonId(), standardInterpretClauseSublist.getInterpretPersonId())); - first.setTranslation(mergeString(first.getTranslation(), - standardInterpretClauseSublist.getTranslation())); +// first.setTranslation(mergeString(first.getTranslation(), +// standardInterpretClauseSublist.getTranslation())); first.setIsSameAsPrevVersion(mergeString(first.getIsSameAsPrevVersion(), standardInterpretClauseSublist.getIsSameAsPrevVersion())); first.setChangeDescription(mergeString(first.getChangeDescription(),