From e2e7a16c56c782372bfc9c4b3ff5355f522c48cb Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 11 Jan 2024 14:38:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=E8=AE=BE=E8=AE=A1=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88=E5=A1=AB=E5=86=99=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cessFbStandardConsultationServiceImpl.java | 84 ++++++++++--------- 1 file changed, 46 insertions(+), 38 deletions(-) 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 c5208f04..4f424621 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 @@ -444,7 +444,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl() + .eq(ProcessFbConsultationUserLink::getId, userLinkId) + .set(ProcessFbConsultationUserLink::getDesignEngineerId, designEngineerId)); +// ProcessFbConsultationUserLink processFbConsultationUserLink = processFbConsultationUserLinkService.getById(userLinkId); +// List designEngineerIdList = Arrays.asList(designEngineerId.split(",")); - List userLinkList = new ArrayList<>(); +// List userLinkList = new ArrayList<>(); +// +// designEngineerIdList.forEach(designEngineer -> { +// ProcessFbConsultationUserLink userLink = new ProcessFbConsultationUserLink(); +// userLink.setUserType(FbCommon.USER_TYPE_MODULE_OWNER); +// userLink.setBusinessId(processFbConsultationUserLink.getBusinessId()); +// userLink.setDepartLeaderId(processFbConsultationUserLink.getDepartLeaderId()); +// userLink.setModuleOwnerId(processFbConsultationUserLink.getModuleOwnerId()); +// userLink.setDesignEngineerId(designEngineer); +// userLinkList.add(userLink); +// }); +// +// processFbConsultationUserLinkService.removeById(userLinkId); // 先删除 +// processFbConsultationUserLinkService.saveBatch(userLinkList, userLinkList.size()); // 后新增 - designEngineerIdList.forEach(designEngineer -> { - ProcessFbConsultationUserLink userLink = new ProcessFbConsultationUserLink(); - userLink.setUserType(FbCommon.USER_TYPE_MODULE_OWNER); - userLink.setBusinessId(processFbConsultationUserLink.getBusinessId()); - userLink.setDepartLeaderId(processFbConsultationUserLink.getDepartLeaderId()); - userLink.setModuleOwnerId(processFbConsultationUserLink.getModuleOwnerId()); - userLink.setDesignEngineerId(designEngineer); - userLinkList.add(userLink); - }); - - processFbConsultationUserLinkService.removeById(userLinkId); // 先删除 - processFbConsultationUserLinkService.saveBatch(userLinkList, userLinkList.size()); // 后新增 - - List idList = userLinkList.stream().map(ProcessFbConsultationUserLink::getId).collect(Collectors.toList()); +// List idList = userLinkList.stream().map(ProcessFbConsultationUserLink::getId).collect(Collectors.toList()); String processInstanceId = task.getProcessInstanceId(); - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_DESIGN_ENGINEER_LIST, idList); + runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_DESIGN_ENGINEER_LIST, designEngineerIdList); saveNodeUserLink(processInstanceId, ConsultationNodeSort.DESIGN_ENGINEER_LIST, designEngineerIdList); // 完成任务 @@ -660,26 +664,30 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl() + .eq(ProcessFbConsultationUserLink::getId, userLinkId) + .set(ProcessFbConsultationUserLink::getDesignEngineerId, designEngineerId)); +// ProcessFbConsultationUserLink processFbConsultationUserLink = processFbConsultationUserLinkService.getById(userLinkId); +// List designEngineerIdList = Arrays.asList(designEngineerId.split(",")); +// List userLinkList = new ArrayList<>(); - List designEngineerIdList = Arrays.asList(designEngineerId.split(",")); - List userLinkList = new ArrayList<>(); - - designEngineerIdList.forEach(designEngineer -> { - ProcessFbConsultationUserLink userLink = new ProcessFbConsultationUserLink(); - userLink.setUserType(FbCommon.USER_TYPE_MODULE_OWNER); - userLink.setBusinessId(processFbConsultationUserLink.getBusinessId()); - userLink.setDepartLeaderId(processFbConsultationUserLink.getDepartLeaderId()); - userLink.setModuleOwnerId(processFbConsultationUserLink.getModuleOwnerId()); - userLink.setDesignEngineerId(designEngineer); - userLinkList.add(userLink); - }); - - int size = userLinkList.size(); - if (size > 0) { - processFbConsultationUserLinkService.removeById(userLinkId); // 先删除 - processFbConsultationUserLinkService.saveBatch(userLinkList, size); // 后新增 - } +// designEngineerIdList.forEach(designEngineer -> { +// ProcessFbConsultationUserLink userLink = new ProcessFbConsultationUserLink(); +// userLink.setUserType(FbCommon.USER_TYPE_MODULE_OWNER); +// userLink.setBusinessId(processFbConsultationUserLink.getBusinessId()); +// userLink.setBusinessId(processInfoVO.getBusinessId()); +// userLink.setDepartLeaderId(processFbConsultationUserLink.getDepartLeaderId()); +// userLink.setModuleOwnerId(processFbConsultationUserLink.getModuleOwnerId()); +// userLink.setDesignEngineerId(designEngineer); +// userLinkList.add(userLink); +// }); +// +// int size = userLinkList.size(); +// if (size > 0) { +// processFbConsultationUserLinkService.removeById(userLinkId); // 先删除 +// processFbConsultationUserLinkService.saveBatch(userLinkList, size); // 后新增 +// } }