diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/TransferVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/TransferVO.java index a7063da6..025b7b9c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/TransferVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/TransferVO.java @@ -12,4 +12,6 @@ public class TransferVO { String taskId; String userId; + + String projectId; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java index 08b13f90..bffcb16a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java @@ -92,7 +92,7 @@ public class ProcessFbStandardConsultationController extends JeroController transfer(@RequestBody TransferVO transferVO) { - processFbStandardConsultationService.transfer(transferVO.getTaskId(), transferVO.getUserId()); + processFbStandardConsultationService.transfer(transferVO.getTaskId(), transferVO.getUserId(), transferVO.getProjectId()); return Result.OK(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java index 47a25bdf..e1748482 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java @@ -49,7 +49,7 @@ public interface IProcessFbStandardConsultationService extends IService() + .eq(ProcessFbConsultationUserLink::getBusinessId, projectId) + .eq(ProcessFbConsultationUserLink::getDesignEngineerId, CurrentUserUtil.getId()) + .set(ProcessFbConsultationUserLink::getDesignEngineerId, toUserId)); + } + // 模块负责人汇总填写意见 + if (ConsultationTaskKey.DEPART_LEADER_START_1.equals(taskDefinitionKey) + || ConsultationTaskKey.MODULE_OWNER_END_2.equals(taskDefinitionKey) + || ConsultationTaskKey.MODULE_OWNER_END_3.equals(taskDefinitionKey)){ + processFbConsultationUserLinkService.update( + new LambdaUpdateWrapper() + .eq(ProcessFbConsultationUserLink::getBusinessId, projectId) + .eq(ProcessFbConsultationUserLink::getModuleOwnerId, CurrentUserUtil.getId()) + .set(ProcessFbConsultationUserLink::getModuleOwnerId, toUserId)); + } } /**