From 74f7866986d7fa6902fd4a10dfb6e18a09cd4eb5 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 23 Jun 2026 17:54:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(flow):=20=E6=9F=A5=E8=AF=A2=E4=BB=A3?= =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E5=92=8C=E6=89=A7=E8=A1=8C=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E6=97=B6=E8=BF=87=E6=BB=A4=E5=B7=B2=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在查询投诉任务列表时添加驳回标记条件 - 在查询计划执行关联列表时添加驳回标记条件 - 确保只统计未被驳回的任务和执行反馈记录 - 修复了已完成状态判断逻辑中的数据过滤问题 --- .../com/klp/flow/service/impl/TsComplaintTaskServiceImpl.java | 2 +- .../com/klp/flow/service/impl/TsPlanExecuteRelServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/klp-flow/src/main/java/com/klp/flow/service/impl/TsComplaintTaskServiceImpl.java b/klp-flow/src/main/java/com/klp/flow/service/impl/TsComplaintTaskServiceImpl.java index 0598a2e9..a7983e0e 100644 --- a/klp-flow/src/main/java/com/klp/flow/service/impl/TsComplaintTaskServiceImpl.java +++ b/klp-flow/src/main/java/com/klp/flow/service/impl/TsComplaintTaskServiceImpl.java @@ -161,7 +161,7 @@ public class TsComplaintTaskServiceImpl implements ITsComplaintTaskService { // 查询该受理单下所有未删除的代办任务 List taskList = baseMapper.selectList( Wrappers.lambdaQuery() - .eq(TsComplaintTask::getAcceptId, acceptId) + .eq(TsComplaintTask::getAcceptId, acceptId).eq(TsComplaintTask::getRejectMark,0) ); // 判断所有任务是否都已完成（taskStatus = 1） boolean allCompleted = !taskList.isEmpty() && taskList.stream() diff --git a/klp-flow/src/main/java/com/klp/flow/service/impl/TsPlanExecuteRelServiceImpl.java b/klp-flow/src/main/java/com/klp/flow/service/impl/TsPlanExecuteRelServiceImpl.java index 5e10be65..c10eb71e 100644 --- a/klp-flow/src/main/java/com/klp/flow/service/impl/TsPlanExecuteRelServiceImpl.java +++ b/klp-flow/src/main/java/com/klp/flow/service/impl/TsPlanExecuteRelServiceImpl.java @@ -158,7 +158,7 @@ public class TsPlanExecuteRelServiceImpl implements ITsPlanExecuteRelService { // 查询该受理单下所有执行反馈记录 List relList = baseMapper.selectList( Wrappers.lambdaQuery() - .eq(TsPlanExecuteRel::getAcceptId, acceptId) + .eq(TsPlanExecuteRel::getAcceptId, acceptId).eq(TsPlanExecuteRel::getRejectMark,0) ); // 判断所有执行反馈是否都已完成（executeStatus = 1） boolean allCompleted = !relList.isEmpty() && relList.stream()