From bb0b80bd7ca7c1f979ab0125ae01f3faa1d14f4b Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:37:57 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_business' into fix/hsy/20260811
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceMapper.java | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceMapper.java
index cdbef63..e10010c 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceMapper.java
@@ -5,11 +5,8 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoicePageReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO;
-import cn.iocoder.yudao.module.erp.enums.ErpPurchaseInvoiceAuditStatusEnum;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
-import java.util.Collection;
import java.util.List;
/**
@@ -24,34 +21,22 @@
return selectOne(ErpPurchaseInvoiceDO::getNo, no);
}
- default int updateByIdAndStatus(Long id, Integer status, ErpPurchaseInvoiceDO updateObj) {
- return update(updateObj, new LambdaUpdateWrapper<ErpPurchaseInvoiceDO>()
- .eq(ErpPurchaseInvoiceDO::getId, id).eq(ErpPurchaseInvoiceDO::getAuditStatus, status));
- }
-
default PageResult<ErpPurchaseInvoiceDO> selectPage(ErpPurchaseInvoicePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ErpPurchaseInvoiceDO>()
.likeIfPresent(ErpPurchaseInvoiceDO::getNo, reqVO.getNo())
.eqIfPresent(ErpPurchaseInvoiceDO::getSupplierId, reqVO.getSupplierId())
.eqIfPresent(ErpPurchaseInvoiceDO::getPurchaseOrderId, reqVO.getPurchaseOrderId())
- .eqIfPresent(ErpPurchaseInvoiceDO::getAuditStatus, reqVO.getAuditStatus())
.orderByDesc(ErpPurchaseInvoiceDO::getId));
}
- default List<ErpPurchaseInvoiceDO> selectListByOrderIdAndStatus(Long orderId, Collection<Integer> auditStatuses) {
+ default List<ErpPurchaseInvoiceDO> selectListByOrderId(Long orderId) {
return selectList(new LambdaQueryWrapperX<ErpPurchaseInvoiceDO>()
- .eq(ErpPurchaseInvoiceDO::getPurchaseOrderId, orderId)
- .in(ErpPurchaseInvoiceDO::getAuditStatus, auditStatuses));
+ .eq(ErpPurchaseInvoiceDO::getPurchaseOrderId, orderId));
}
- default List<ErpPurchaseInvoiceDO> selectListBySupplierIdAndStatus(Long supplierId, Collection<Integer> auditStatuses) {
+ default List<ErpPurchaseInvoiceDO> selectListBySupplierId(Long supplierId) {
return selectList(new LambdaQueryWrapperX<ErpPurchaseInvoiceDO>()
- .eq(ErpPurchaseInvoiceDO::getSupplierId, supplierId)
- .in(ErpPurchaseInvoiceDO::getAuditStatus, auditStatuses));
- }
-
- default Long selectCountByAudit() {
- return selectCount(ErpPurchaseInvoiceDO::getAuditStatus, ErpPurchaseInvoiceAuditStatusEnum.PROCESS.getStatus());
+ .eq(ErpPurchaseInvoiceDO::getSupplierId, supplierId));
}
}
--
Gitblit v1.9.3