diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java index cfde4687..10be01c8 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java @@ -589,6 +589,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SarFileSplitInfoEO::getIsAsmsImport, "1"); List sarFileSplitInfoEOList = sarFileSplitInfoService.list(queryWrapper); + List sysDictItemList = sysDictItemService.list(); Map paramMap = new HashMap<>(); Map paramMap2 = new HashMap<>(); Map paramMap3 = new HashMap<>(); @@ -618,8 +619,9 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl sysDictItemList = sysDictItemService.list(); Map paramMap1 = new HashMap<>(); Map paramMap2 = new HashMap<>(); Map paramMap3 = new HashMap<>(); @@ -393,6 +394,17 @@ public class SynchronizationAsmsService { lawsDocumentSplit.setId(UUIDUtils.randomUUID20()); + lawsDocumentSplit.setLawsRequireType(getItemValues(lawsDocumentSplit.getLawsRequireType(), + "1702212236079886338", sysDictItemList)); // 法规要求类型 + lawsDocumentSplit.setFunctionClassification(getItemValues(lawsDocumentSplit.getFunctionClassification(), + "1702212237296234497", sysDictItemList)); // 功能分类 + lawsDocumentSplit.setFunctionProfessional(getItemValues(lawsDocumentSplit.getFunctionProfessional(), + "1702202280677044226", sysDictItemList)); // 功能专业 + lawsDocumentSplit.setApplications(getItemValues(lawsDocumentSplit.getApplications(), + "1702518672924110850", sysDictItemList)); // 适用车型 + lawsDocumentSplit.setDynamicType(getItemValues(lawsDocumentSplit.getDynamicType(), + "1702518671166697474", sysDictItemList)); // 动力类型 + insertDocumentList.add(lawsDocumentSplit); lawsDocumentSplitMapper.insert(lawsDocumentSplit); n[0]++; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java index 0fc8ab85..9f2cecd1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java @@ -45,6 +45,4 @@ public class ConsultationTaskKey { public static final String SUB_PROCESS_3 = "sub_process_3"; // 子流程 - public static final String SUB_PROCESS_FINISH = "sub_process_finish"; // 一级子流程结束 - } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index 55b76569..3aa37e5c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -328,17 +328,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl log.info("任务id: {}", lastTask.getId())); - executionList.forEach(lastExecution -> log.info("执行实例id: {}", lastExecution.getId())); + executionList.forEach(lastExecution -> { + log.info("执行实例id: {}", lastExecution.getId()); + log.info("执行实例name: {}", lastExecution.getName()); + log.info("执行实例activityId: {}", lastExecution.getActivityId()); + }); } } diff --git a/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn b/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn index 96d48b57..ad0512b6 100644 --- a/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn +++ b/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn @@ -105,7 +105,7 @@ Flow_18olfei Flow_0f48izh - Flow_065o52n + Flow_0dy528b @@ -116,9 +116,8 @@ Flow_09jjte7 - Flow_0qai32h + Flow_0zrmtql - @@ -130,21 +129,16 @@ - - - - - Flow_065o52n - Flow_0qai32h - Flow_0mtwkua - - + + Flow_0dy528b + + ${passSecond} - - Flow_0mtwkua + + Flow_0zrmtql - + @@ -275,27 +269,15 @@ - - - - - - - + + - - - - - - - - - + + @@ -334,6 +316,17 @@ + + + + + + + + + + + @@ -377,25 +370,20 @@ - - - - - - + - + - + - - - + + +