From 929cab9c0525c595ff8ea2e40a045eca91d4f55b Mon Sep 17 00:00:00 2001 From: fangjiakai <450850793@qq.com> Date: Sat, 14 Mar 2026 09:41:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(task):=20=E4=BF=AE=E5=A4=8D=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 TaskFlowQueryExe 中添加按 step_id 去重逻辑 - 将 eqCurrentStep 字段更改为 eqStepId 以匹配业务逻辑 - 将 eqStatus 和 eqCurrentStep 的数据类型从 int 改为 Integer - 使用 LinkedHashMap 确保去重后的数据顺序保持一致 --- .../eightwork/command/query/TaskFlowQueryExe.java | 10 +++++++--- .../java/com/zcloud/eightwork/dto/TaskLogPageQry.java | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskFlowQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskFlowQueryExe.java index 2ce82ca..1547eb4 100644 --- a/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskFlowQueryExe.java +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskFlowQueryExe.java @@ -86,12 +86,16 @@ public class TaskFlowQueryExe { List taskIds = taskDOs.stream().map(EightworkTaskDO::getId).collect(Collectors.toList()); List flows = taskFlowRepository.list(new QueryWrapper() - .select("DISTINCT step_id as step_id") - .select("step_name") - .select("group_name") .in("task_id", taskIds) .orderByAsc("step_order")); + // 按 step_id 去重 + Map uniqueFlows = new LinkedHashMap<>(); + for (TaskFlowDO flow : flows) { + uniqueFlows.putIfAbsent(flow.getStepId(), flow); + } + flows = new ArrayList<>(uniqueFlows.values()); + // 转换为 CO List flowCOs = taskFlowCoConvertor.converDOsToCOs(flows); diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java index f0903be..065aab0 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java @@ -25,7 +25,7 @@ public class TaskLogPageQry extends PageQuery { * - `ne`: 不等比较查询，对应SQL的!=操作符 */ private String eqWorkType; - private int eqStatus; - private int eqCurrentStep; + private Integer eqStatus; + private Integer eqStepId; }