gaoluyang
5 天以前 8168aef3c7557c9e1361892270a1ebe35dbddba5
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
@@ -31,15 +31,23 @@
    }
    default PageResult<ErpPurchaseRequestDO> selectPage(ErpPurchaseRequestPageReqVO pageReqVO) {
        return selectPage(pageReqVO, new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
        LambdaQueryWrapperX<ErpPurchaseRequestDO> wrapper = new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
                .likeIfPresent(ErpPurchaseRequestDO::getNo, pageReqVO.getNo())
                .eqIfPresent(ErpPurchaseRequestDO::getRequestUserId, pageReqVO.getRequestUserId())
                .eqIfPresent(ErpPurchaseRequestDO::getRequestDeptId, pageReqVO.getRequestDeptId())
                .eqIfPresent(ErpPurchaseRequestDO::getSupplierId, pageReqVO.getSupplierId())
                .likeIfPresent(ErpPurchaseRequestDO::getInquiryNo, pageReqVO.getInquiryNo())
                .likeIfPresent(ErpPurchaseRequestDO::getOrderNo, pageReqVO.getOrderNo())
                .eqIfPresent(ErpPurchaseRequestDO::getStatus, pageReqVO.getStatus())
                .eqIfPresent(ErpPurchaseRequestDO::getInStatus, pageReqVO.getInStatus())
                .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, pageReqVO.getRequestTime())
                .orderByDesc(ErpPurchaseRequestDO::getId));
                .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, pageReqVO.getRequestTime());
        // 待处理:审批通过后,尚未发起询价、也尚未生成采购台账
        if (Boolean.TRUE.equals(pageReqVO.getTodo())) {
            wrapper.isNull(ErpPurchaseRequestDO::getInquiryId)
                    .isNull(ErpPurchaseRequestDO::getOrderId);
        }
        wrapper.orderByDesc(ErpPurchaseRequestDO::getId);
        return selectPage(pageReqVO, wrapper);
    }
}