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 69743255..2662428f 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 @@ -305,6 +305,30 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl consultationLists = processFbConsultationListService.list(queryWrapper); processFbStandardConsultationVO.setProcessFbConsultationLists(consultationLists); + Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); + String taskDefinitionKey = task.getTaskDefinitionKey(); // 任务定义id + switch (taskDefinitionKey) { + case ConsultationTaskKey.DEPART_LEADER_START_1: + processDepartLeaderStart_1_draft(processInfoVO); // 各部所主管级领导分发 + break; + case ConsultationTaskKey.DESIGN_ENGINEER_1: // 设计工程师填写征求意见(分发给模块负责人) + case ConsultationTaskKey.DESIGN_ENGINEER_2: // 设计工程师填写征求意见(不分发给模块负责人) + designEngineer_draft(processInfoVO); + break; + case ConsultationTaskKey.MODULE_OWNER_END_1: // 模块负责人汇总填写意见(可跳过) + case ConsultationTaskKey.MODULE_OWNER_END_2: // 模块负责人汇总填写意见(主管级领导驳回后) + case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总 + case ConsultationTaskKey.DEPART_LEADER_COLLECT_3: // 法规工程师审批驳回后的子流程中的各部所主管级领导汇总 + case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总(不分发给模块负责人) + collect_draft(processInfoVO); + break; + case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发 + moduleOwnerStart_draft(processInfoVO); + break; + default: + log.info("taskDefinitionKey:{},没有业务数据保存", taskDefinitionKey); + } + processInfoVO.setBusinessInfoDTO(processFbStandardConsultationVO); return processInfoVO; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java index 06c02c38..87f40f9b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java @@ -91,14 +91,14 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl> processInfoVO) { List businessInfoList = processInfoVO.getBusinessInfoDTO(); - if (CollectionUtils.isEmpty(businessInfoList)) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, "businessInfo"); + String businessId = UUIDUtils.randomUUID20(); + if (CollectionUtils.isNotEmpty(businessInfoList)) { + businessId = businessInfoList.get(0).getBusinessId(); + processInfoVO.setBusinessId(businessId); + } else { + processInfoVO.setBusinessId(businessId); + return businessId; } - String businessId = businessInfoList.get(0).getBusinessId(); - if (StringUtils.isBlank(businessId)) { - businessId = UUIDUtils.randomUUID20(); - } - processInfoVO.setBusinessId(businessId); for (int i = 0; i < businessInfoList.size(); i++) { if (StringUtils.isBlank(businessInfoList.get(i).getStandardNumber())) { throw new JeroBootException(ResultCommon.EMPTY_COMMON, "standardNumber"); @@ -127,6 +127,7 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl> processInfoVO, boolean pass) { List businessInfoList = processInfoVO.getBusinessInfoDTO(); + addBusinessInfo(processInfoVO); processInfoVO.setBusinessId(businessInfoList.get(0).getBusinessId()); processHandleService.approveTask(processInfoVO, pass);