From abd59338774d048957e22732cbb0f1ba90ae3458 Mon Sep 17 00:00:00 2001 From: lzh Date: Fri, 30 Jan 2026 09:45:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(ops):=20=E5=85=A5=E9=98=9F=E5=92=8C?= =?UTF-8?q?=E6=B4=BE=E5=8D=95=E6=97=B6=E8=AE=BE=E7=BD=AEassigneeDeviceId?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/lifecycle/OrderLifecycleManagerImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/OrderLifecycleManagerImpl.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/OrderLifecycleManagerImpl.java index 3ef7eb8..08a5adc 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/OrderLifecycleManagerImpl.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/OrderLifecycleManagerImpl.java @@ -137,6 +137,7 @@ public class OrderLifecycleManagerImpl implements OrderLifecycleManager { // 先更新工单的执行人 OpsOrderDO order = getOrderByOrderId(request.getOrderId()); order.setAssigneeId(request.getAssigneeId()); + order.setAssigneeDeviceId(request.getAssigneeId()); // 同时设置设备ID，用于查询工单 opsOrderMapper.updateById(order); // 执行状态转换 @@ -146,7 +147,8 @@ public class OrderLifecycleManagerImpl implements OrderLifecycleManager { @Override @Transactional(rollbackFor = Exception.class) public OrderTransitionResult dispatch(OrderTransitionRequest request) { - log.info("工单派发: orderId={}, queueId={}, assigneeId={}", request.getOrderId(), request.getQueueId(), request.getAssigneeId()); + log.info("工单派发: orderId={}, queueId={}, assigneeId={}", request.getOrderId(), request.getQueueId(), + request.getAssigneeId()); // 设置目标状态 request.setTargetStatus(WorkOrderStatusEnum.DISPATCHED); @@ -156,6 +158,7 @@ public class OrderLifecycleManagerImpl implements OrderLifecycleManager { OpsOrderDO order = opsOrderMapper.selectById(request.getOrderId()); if (order != null && order.getAssigneeId() == null) { order.setAssigneeId(request.getAssigneeId()); + order.setAssigneeDeviceId(request.getAssigneeId()); // 同时设置设备ID，用于查询工单 opsOrderMapper.updateById(order); log.debug("派发时更新工单执行人: orderId={}, assigneeId={}", request.getOrderId(), request.getAssigneeId()); } @@ -409,13 +412,13 @@ public class OrderLifecycleManagerImpl implements OrderLifecycleManager { /** * 记录状态变更业务日志 * - * @param orderId 工单ID - * @param result 状态转换结果 - * @param eventType 事件类型 - * @param message 日志消息 + * @param orderId 工单ID + * @param result 状态转换结果 + * @param eventType 事件类型 + * @param message 日志消息 */ private void recordStatusChangeLog(Long orderId, OrderTransitionResult result, - String eventType, String message) { + String eventType, String message) { try { OpsOrderDO order = opsOrderMapper.selectById(orderId); if (order == null) {