diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java index ab54ae3..cad3be8 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java @@ -15,6 +15,7 @@ import com.ruoyi.oa.domain.OaProjectSchedule; import com.ruoyi.oa.domain.bo.BatchBo; import com.ruoyi.oa.domain.dto.NodeDTO; import com.ruoyi.oa.mapper.OaProjectScheduleMapper; +import kotlin.jvm.internal.Lambda; import lombok.RequiredArgsConstructor; import org.flowable.job.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -62,11 +63,25 @@ public class OaProjectScheduleStepServiceImpl implements IOaProjectScheduleStepS } @Override public TableDataInfo queryPageListPage(OaProjectScheduleStepBo bo, PageQuery pageQuery) { - QueryWrapper lqw = buildQueryWrapper(bo); + LambdaQueryWrapper lqw = buildQueryWrapperLambda(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } + private LambdaQueryWrapper buildQueryWrapperLambda(OaProjectScheduleStepBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + + lqw.eq(bo.getScheduleId() != null, OaProjectScheduleStep::getScheduleId, bo.getScheduleId()) + .eq(OaProjectScheduleStep::getDelFlag, 0) + .eq(bo.getStepOrder() != null, OaProjectScheduleStep::getStepOrder, bo.getStepOrder()) + .like(StringUtils.isNotBlank(bo.getStepName()), OaProjectScheduleStep::getStepName, bo.getStepName()) + .eq(bo.getStatus() != null, OaProjectScheduleStep::getStatus, bo.getStatus()); + + return lqw; + } + + /** * 查询项目进度步骤跟踪列表 */