diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index ffdac8ae..bf293726 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -30,10 +30,14 @@ import com.jero.modules.activiti.process.standardComplianceCheck.service.IProces import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckService; import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.util.ExcelUtils; +import com.jero.modules.laws.documenttool.entity.LawsDocumentSplit; +import com.jero.modules.laws.documenttool.mapper.DocumentSplitMapper; import com.jero.modules.laws.documenttool.service.IDocumentSplitService; import com.jero.modules.laws.enterprise.util.BeanCopyUtils; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.split.entity.SarFileSplitInfoEO; +import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.sys.utils.UserUtils; import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.service.ISysDepartService; @@ -93,6 +97,12 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl processInfoVO) { // 流程Key @@ -394,17 +404,37 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl generate(ProcessStandardComplianceCheck scc) throws Exception { String splitFileSource = scc.getSplitFileSource(); + List detailInfoList; + // 找到拆分数据 + if (StrUtil.isBlank(splitFileSource)) { + MultipartFile splitFile = this.getFileById(scc.getSplitFile()); + detailInfoList = this.getSplitData(scc, splitFile); + } else { + detailInfoList = this.getSplitDataByStandard(scc.getStandardId(), splitFileSource); + } // 获取两个文件 MultipartFile modelFile = this.getFileById(scc.getModelFile()); - MultipartFile splitFile = this.getFileById(scc.getSplitFile()); // 文件内容转换 List modelExcelVOList = this.getModelExcelData(modelFile); - // 找到拆分数据 - List detailInfoList = this.getSplitData(scc, splitFile); // 根据主表数据和车型文件生成子表数据并保存 return this.saveAllDetailData(modelExcelVOList, detailInfoList); } + private List getSplitDataByStandard(String standardId, String fileType) { + List list = new ArrayList<>(); + SarFileSplitInfoEO sarFileSplitInfoEO = + sarFileSplitInfoService.getOne(new LambdaQueryWrapper() + .eq(SarFileSplitInfoEO::getStandardId, standardId) + .eq(SarFileSplitInfoEO::getFileType, fileType) + .isNull(SarFileSplitInfoEO::getPublishBeforeId), false); + if (!Objects.isNull(sarFileSplitInfoEO)){ + LawsDocumentSplit lawsDocumentSplit = new LawsDocumentSplit(); + lawsDocumentSplit.setInfoId(sarFileSplitInfoEO.getId()); + list = documentSplitMapper.selectClauseListScc(lawsDocumentSplit); + } + return list; + } + @Override public ProcessInfoVO getHandleData(String taskId) { if (!actFlowCommonService.taskExists(taskId)) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java index 26564892..fb0be9e1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClause; import com.jero.modules.laws.documenttool.entity.*; import com.jero.modules.split.entity.SarFileSplitInfoEO; @@ -215,4 +216,6 @@ public interface DocumentSplitMapper extends BaseMapper { List queryLawsDocumentSplitGroupByMenuId(@Param("infoId") String infoId); List selectClauseList(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit); + + List selectClauseListScc(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit); } 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 fbda2edc..7deeade8 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 @@ -273,6 +273,21 @@ + + UPDATE laws_document_split SET ${updateSet}