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()