QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准解读): 译文改为标准里带出

Browse Source
This commit is contained in:
yjz
2024-08-02 10:26:02 +08:00
parent d908964490
commit 429f75778a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml
+2 -1
View File
@@ -9,7 +9,7 @@
standard_interpret_clause_id, standard_interpret_clause_id,
clause_id, clause_id,
interpret_person_id, interpret_person_id,
`translation`, psic2.translation
is_same_as_prev_version, is_same_as_prev_version,
change_description, change_description,
regulatory_notes, 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_number, lds2.item_num) itemNum,
IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle, IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle,
IF(lds.id is not null, null, lds2.item_content) itemContent, IF(lds.id is not null, null, lds2.item_content) itemContent,
lds2.translation,
standard_interpret_id standard_interpret_id
from process_standard_interpret_clause psic from process_standard_interpret_clause psic
left join laws_domestic_standard lds on psic.clause_id = lds.id and lds.del_flag = 0 left join laws_domestic_standard lds on psic.clause_id = lds.id and lds.del_flag = 0
laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
+3 -2
View File
@@ -256,6 +256,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
lawsDocumentSplit.setItemNum(null); lawsDocumentSplit.setItemNum(null);
lawsDocumentSplit.setItemTitle(null); lawsDocumentSplit.setItemTitle(null);
lawsDocumentSplit.setItemContent(null); lawsDocumentSplit.setItemContent(null);
lawsDocumentSplit.setTranslation(null);
LawsDomesticStandard lawsDomesticStandard = LawsDomesticStandard lawsDomesticStandard =
lawsDomesticStandardService.getById(standardInterpretClauseSublist.getClauseId()); lawsDomesticStandardService.getById(standardInterpretClauseSublist.getClauseId());
if (!Objects.isNull(lawsDomesticStandard)){ if (!Objects.isNull(lawsDomesticStandard)){
@@ -467,8 +468,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
// 合并 // 合并
first.setInterpretPersonId(mergeString(first.getInterpretPersonId(), first.setInterpretPersonId(mergeString(first.getInterpretPersonId(),
standardInterpretClauseSublist.getInterpretPersonId())); standardInterpretClauseSublist.getInterpretPersonId()));
first.setTranslation(mergeString(first.getTranslation(), // first.setTranslation(mergeString(first.getTranslation(),
standardInterpretClauseSublist.getTranslation())); // standardInterpretClauseSublist.getTranslation()));
first.setIsSameAsPrevVersion(mergeString(first.getIsSameAsPrevVersion(), first.setIsSameAsPrevVersion(mergeString(first.getIsSameAsPrevVersion(),
standardInterpretClauseSublist.getIsSameAsPrevVersion())); standardInterpretClauseSublist.getIsSameAsPrevVersion()));
first.setChangeDescription(mergeString(first.getChangeDescription(), first.setChangeDescription(mergeString(first.getChangeDescription(),