From 41870d4121804a492edde1d69e37dd6ce7b039dc Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 18 Mar 2026 20:10:57 +0800 Subject: [PATCH] =?UTF-8?q?fix[project]:=20=E4=BF=AE=E6=94=B9syncTodoPhase?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LyricInternalServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index 012bbf4c..b7cf5a67 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -593,7 +593,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { } } else { // 阶段不存在,同步阶段机台工位 - syncTodoPhase(todo.getCreateTime(), Long.valueOf(projectNode.getProjectId()), todo.getProjectStage(), projectNode.getUuid(), req,todo.getStationNum()); + syncTodoPhase(todo.getCreateTime(), Long.valueOf(projectNode.getProjectId()), todo.getProjectStage(), projectNode.getUuid(), req,todo.getStationNum(), projectNode); } } @@ -3499,7 +3499,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { return resultList; } - private void syncTodoPhase(String curDateStr, Long projectId, String currentPhase, String projectNodeId, SpdmAddDemandReq req,String stationNum) { + private void syncTodoPhase(String curDateStr, Long projectId, String currentPhase, String projectNodeId, SpdmAddDemandReq req,String stationNum,SimulationNode projectNode) { Long tenantId = req.getTenantId(); Long jobNumber = req.getCreator(); List currentNodeList; @@ -3660,8 +3660,14 @@ public class LyricInternalServiceImpl implements ILyricInternalService { } // 批量创建文件夹 - batchCreateNodeDir(addNodeList); - + SpdmProjectNodeEditReq spdmProjectNodeEditReq = new SpdmProjectNodeEditReq(); + BeanUtils.copyProperties(projectNode, spdmProjectNodeEditReq); + NodeServiceImpl.NodeTypeFilterResult filterResult = new NodeServiceImpl.NodeTypeFilterResult(spdmProjectNodeEditReq + , addNodeList.stream().filter(node -> NodeTypeEnum.PHASE.getValue().equals(node.getNodeType())).collect(Collectors.toList()) + , addNodeList.stream().filter(node -> NodeTypeEnum.MACHINE.getValue().equals(node.getNodeType())).collect(Collectors.toList()) + , addNodeList.stream().filter(node -> NodeTypeEnum.WORKSPACE.getValue().equals(node.getNodeType())).collect(Collectors.toList())); + BatchCreateDirReq batchCreateDirReq = buildBatchCreateDirReq(filterResult); + callBatchCreateDirApi(batchCreateDirReq); }