From 8168aef3c7557c9e1361892270a1ebe35dbddba5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 11:42:19 +0800
Subject: [PATCH] refactor(erp): 采购申请与询价比价流程重构
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java | 63 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
index d44d171..1564a8e 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
@@ -2,45 +2,52 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Collection;
+import java.util.List;
/**
* ERP 閲囪喘鐢宠 Mapper
- *
- * @author 鑺嬮亾婧愮爜
*/
@Mapper
public interface ErpPurchaseRequestMapper extends BaseMapperX<ErpPurchaseRequestDO> {
-
- default PageResult<ErpPurchaseRequestDO> selectPage(ErpPurchaseRequestPageReqVO reqVO) {
- MPJLambdaWrapperX<ErpPurchaseRequestDO> query = new MPJLambdaWrapperX<ErpPurchaseRequestDO>()
- .likeIfPresent(ErpPurchaseRequestDO::getNo, reqVO.getNo())
- .eqIfPresent(ErpPurchaseRequestDO::getRequestUserId, reqVO.getRequestUserId())
- .eqIfPresent(ErpPurchaseRequestDO::getRequestDeptId, reqVO.getRequestDeptId())
- .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, reqVO.getRequestTime())
- .eqIfPresent(ErpPurchaseRequestDO::getStatus, reqVO.getStatus())
- .likeIfPresent(ErpPurchaseRequestDO::getRequestReason, reqVO.getRequestReason())
- .orderByDesc(ErpPurchaseRequestDO::getId);
- if (reqVO.getProductId() != null) {
- query.leftJoin(ErpPurchaseRequestItemDO.class, ErpPurchaseRequestItemDO::getRequestId, ErpPurchaseRequestDO::getId)
- .eq(ErpPurchaseRequestItemDO::getProductId, reqVO.getProductId())
- .groupBy(ErpPurchaseRequestDO::getId);
- }
- return selectJoinPage(reqVO, ErpPurchaseRequestDO.class, query);
- }
-
- default int updateByIdAndStatus(Long id, Integer status, ErpPurchaseRequestDO updateObj) {
- return update(updateObj, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
- .eq(ErpPurchaseRequestDO::getId, id).eq(ErpPurchaseRequestDO::getStatus, status));
- }
default ErpPurchaseRequestDO selectByNo(String no) {
return selectOne(ErpPurchaseRequestDO::getNo, no);
}
-}
+ default List<ErpPurchaseRequestDO> selectRequestListByIds(Collection<Long> ids) {
+ return selectList(ErpPurchaseRequestDO::getId, ids);
+ }
+
+ default List<ErpPurchaseRequestDO> selectList(Long supplierId, Integer status) {
+ return selectList(new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
+ .eqIfPresent(ErpPurchaseRequestDO::getSupplierId, supplierId)
+ .eqIfPresent(ErpPurchaseRequestDO::getStatus, status));
+ }
+
+ default PageResult<ErpPurchaseRequestDO> selectPage(ErpPurchaseRequestPageReqVO pageReqVO) {
+ 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());
+ // 寰呭鐞嗭細瀹℃壒閫氳繃鍚庯紝灏氭湭鍙戣捣璇环銆佷篃灏氭湭鐢熸垚閲囪喘鍙拌处
+ if (Boolean.TRUE.equals(pageReqVO.getTodo())) {
+ wrapper.isNull(ErpPurchaseRequestDO::getInquiryId)
+ .isNull(ErpPurchaseRequestDO::getOrderId);
+ }
+ wrapper.orderByDesc(ErpPurchaseRequestDO::getId);
+ return selectPage(pageReqVO, wrapper);
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.9.3