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 052e111e..08dd6106 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 @@ -33,7 +33,7 @@ public class ConsultationTaskKey { public static final String MODULE_OWNER_END_2 = "module_owner_end_2"; // 模块负责人汇总 - public static final String MODULE_OWNER_END_3 = "module_owner_end_3"; // 模块负责人汇总 + public static final String MODULE_OWNER_END_3 = "module_owner_end_3"; // 模块负责人汇总(法规工程师驳回后) public static final String DESIGN_ENGINEER_1 = "design_engineer_1"; // 设计工程师填写征求意见 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/listener/TaskListenerService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/listener/TaskListenerService.java index e55e2baa..c6aa0a8f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/listener/TaskListenerService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/listener/TaskListenerService.java @@ -8,8 +8,10 @@ import com.jero.modules.activiti.process.fb.service.IProcessFbConsultationUserLi import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.laws.common.util.CurrentUserUtil; import lombok.extern.slf4j.Slf4j; +import org.activiti.engine.HistoryService; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.history.HistoricTaskInstance; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -27,6 +29,8 @@ public class TaskListenerService { private IProcessFbConsultationUserLinkService processFbConsultationUserLinkService; @Resource private ProcessAllService processAllService; + @Resource + private HistoryService historyService; public void setBusinessKey(DelegateTask delegateTask) { // 在任务创建时,设置业务key @@ -38,6 +42,8 @@ public class TaskListenerService { DelegateExecution execution = delegateTask.getExecution(); String executionId = execution.getId(); String parentExecutionId = execution.getParentId(); + HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery().executionId(parentExecutionId).singleResult(); + String historicTaskAssignee = historicTask.getAssignee(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, processAll.getProjectId()); @@ -72,9 +78,11 @@ public class TaskListenerService { processFbConsultationUserLinkService.updateById(userLink); break; case ConsultationTaskKey.MODULE_OWNER_END_2: // 模块负责人汇总填写意见(主管级领导驳回后) - case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总 delegateTask.setFormKey(userId); // 绑定主管级领导的id break; + case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总 + delegateTask.setFormKey(historicTaskAssignee); + break; default: log.info("{}没有监听任务", taskDefinitionKey); } 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 87f40f9b..530802bd 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 @@ -94,11 +94,9 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl