diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseSublistServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseSublistServiceImpl.java index 83c45e6a..ac5c7835 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseSublistServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseSublistServiceImpl.java @@ -47,7 +47,9 @@ public class ProcessStandardInterpretClauseSublistServiceImpl processStandardInterpretClauseSublist.getSnowFlake()); queryWrapper.eq("psics.del_flag", CommonConstant.DEL_FLAG_0); queryWrapper.orderByAsc("psics.id"); - return processStandardInterpretClauseSublistMapper.queryList(queryWrapper); + List processStandardInterpretClauseSublistList = + processStandardInterpretClauseSublistMapper.queryList(queryWrapper); + return processStandardInterpretClauseSublistList; } @Override 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 556f92c8..d02cff36 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 @@ -780,6 +780,23 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe } processStandardInterpretClauseSublistList = processStandardInterpretClauseSublistService.queryList(processStandardInterpretClauseSublist); + // 判断第一行是不是标准 + if (CollectionUtils.isNotEmpty(processStandardInterpretClauseSublistList)) { + ProcessStandardInterpretClauseSublist clauseSublist = processStandardInterpretClauseSublistList.get(0); + LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.getById(clauseSublist.getClauseId()); + if (!Objects.isNull(lawsDomesticStandard)){ + // 查询拆分信息 + List lawsDocumentSplits = lawsDocumentSplitMapper.selectList( + new LambdaQueryWrapper() + .eq(LawsDocumentSplit::getStandardId, lawsDomesticStandard.getId()) + .eq(LawsDocumentSplit::getInfoId, processStandardInterpret.getSplitInfoId())); + if (CollectionUtils.isNotEmpty(lawsDocumentSplits)){ + LawsDocumentSplit lawsDocumentSplit = lawsDocumentSplits.get(0); + clauseSublist.setItemContent(lawsDocumentSplit.getItemContent()); + clauseSublist.setTranslation(lawsDocumentSplit.getTranslation()); + } + } + } } standardInterpretDTO.setProcessStandardInterpret(processStandardInterpret); 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 f9534e7f..50bc31b0 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 @@ -50,12 +50,24 @@ INSERT INTO laws_document_split (id, create_by, create_time, update_by, update_time, sys_org_code, - is_same_as_prev_version, item_title, menu_id, item_content, translation, item_num, info_id, standard_id) + is_same_as_prev_version, item_num, info_id, menu_id, item_title, item_content, translation, + change_description,regulatory_notes,part_name,key_controller,applicable_components,responsible_department,responsible_module, + related_department,related_module,applications,power_type,domain_area,configuration_requirements,new_cer_implement_date, + new_production_implementation,registration_date,enterprise_standard,technical_specification_design_guide,drawing_template, + technical_agreement_template,verification_report_template_checklist,dvp_template,dfema,key_technology_decomposition_table, + other_documents_templates,investigation_stage,p3,p5,remarkss,standard_id,file_type) values - (#{item.id}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.sysOrgCode}, - #{item.isSameAsPrevVersion}, #{item.itemTitle}, #{item.menuId}, #{item.itemContent}, #{item.translation}, - #{item.itemNum}, #{item.infoId}, #{item.standardId}) + (#{item.id}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.sysOrgCode}, + #{item.isSameAsPrevVersion},#{item.itemNum},#{item.infoId},#{item.menuId},#{item.itemTitle},#{item.itemContent}, + #{item.translation},#{item.changeDescription},#{item.regulatoryNotes}, + #{item.partName},#{item.keyController},#{item.applicableComponents},#{item.responsibleDepartment}, + #{item.responsibleModule},#{item.relatedDepartment},#{item.relatedModule},#{item.applications},#{item.powerType}, + #{item.domainArea},#{item.configurationRequirements},#{item.newCerImplementDate}, + #{item.newProductionImplementation},#{item.registrationDate},#{item.enterpriseStandard},#{item.technicalSpecificationDesignGuide}, + #{item.drawingTemplate},#{item.technicalAgreementTemplate}, + #{item.verificationReportTemplateChecklist},#{item.dvpTemplate},#{item.dfema},#{item.keyTechnologyDecompositionTable}, + #{item.otherDocumentsTemplates},#{item.investigationStage},#{item.p3},#{item.p5},#{item.remarkss},#{item.standardId},#{item.fileType}) diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index b6aa66c6..23ef158e 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -798,26 +798,115 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl