From fbaeeeff5704f210bc6347454c0f16d255001822 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 16:32:09 +0800
Subject: [PATCH] refactor(srm): 重构供应商采购域，新增询价比价与保证金管理
---
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierMapper.java | 18 ++----------------
1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierMapper.java
index 398696d..2da7a33 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierMapper.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierMapper.java
@@ -6,30 +6,21 @@
import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierPageReqVO;
import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-import java.util.Collection;
import java.util.List;
@Mapper
public interface SrmSupplierMapper extends BaseMapperX<SrmSupplierDO> {
default PageResult<SrmSupplierDO> selectPage(SrmSupplierPageReqVO reqVO) {
- LambdaQueryWrapperX<SrmSupplierDO> wrapper = new LambdaQueryWrapperX<SrmSupplierDO>()
+ return selectPage(reqVO, new LambdaQueryWrapperX<SrmSupplierDO>()
.likeIfPresent(SrmSupplierDO::getCode, reqVO.getCode())
.likeIfPresent(SrmSupplierDO::getName, reqVO.getName())
.eqIfPresent(SrmSupplierDO::getType, reqVO.getType())
.eqIfPresent(SrmSupplierDO::getStatus, reqVO.getStatus())
.likeIfPresent(SrmSupplierDO::getContactName, reqVO.getContactName())
.likeIfPresent(SrmSupplierDO::getContactMobile, reqVO.getContactMobile())
- .orderByDesc(SrmSupplierDO::getId);
- if (Boolean.TRUE.equals(reqVO.getApproved())) {
- wrapper.apply("id IN (SELECT supplier_id FROM srm_supplier_apply WHERE apply_status = 40 AND supplier_id IS NOT NULL AND deleted = 0)");
- }
- if (Boolean.TRUE.equals(reqVO.getExcludeApproved())) {
- wrapper.apply("id NOT IN (SELECT supplier_id FROM srm_supplier_apply WHERE apply_status = 40 AND supplier_id IS NOT NULL AND deleted = 0)");
- }
- return selectPage(reqVO, wrapper);
+ .orderByDesc(SrmSupplierDO::getId));
}
default SrmSupplierDO selectByCode(String code) {
@@ -39,10 +30,5 @@
default List<SrmSupplierDO> selectListByStatus(Integer status) {
return selectList(SrmSupplierDO::getStatus, status);
}
-
- @Select("SELECT DISTINCT s.* FROM srm_supplier s " +
- "INNER JOIN srm_supplier_apply a ON a.supplier_id = s.id " +
- "WHERE a.apply_status = 40 AND s.status = 0 AND s.deleted = 0")
- List<SrmSupplierDO> selectApprovedList();
}
--
Gitblit v1.9.3