From a461d5fc184fd0129a0eb5a5b3e34f67d75cc6a2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 04 六月 2025 16:51:59 +0800
Subject: [PATCH] 联调基础信息
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
index b885fe7..3f406b0 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
@@ -14,6 +14,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
+import java.util.List;
import java.util.Objects;
/**
@@ -33,17 +34,29 @@
@Override
public IPage<Supply> selectSupplyList(Page page, SupplyDto supplyDto) {
LambdaQueryWrapper<Supply> queryWrapper = new LambdaQueryWrapper<>();
-
- // 渚涘簲鍟嗗悕绉版ā绯婃煡璇�
- if (StringUtils.hasText(supplyDto.getSupplierName())) {
- queryWrapper.like(Supply::getSupplierName, supplyDto.getSupplierName());
+ // 鍏ㄥ眬妯＄硦鎼滅储瀛楁
+ if (StringUtils.hasText(supplyDto.getSearchAll())) {
+ String keyword = supplyDto.getSearchAll();
+ queryWrapper.and(wrapper -> wrapper
+ .like(Supply::getSupplierName, keyword)
+ .or()
+ .like(Supply::getTaxpayerId, keyword)
+ .or()
+ .like(Supply::getBusinessAddress, keyword)
+ );
+ } else {
+ // 鍗曠嫭鏉′欢鏌ヨ
+ if (StringUtils.hasText(supplyDto.getSupplierName())) {
+ queryWrapper.like(Supply::getSupplierName, supplyDto.getSupplierName());
+ }
+ if (StringUtils.hasText(supplyDto.getTaxpayerId())) {
+ queryWrapper.like(Supply::getTaxpayerId, supplyDto.getTaxpayerId());
+ }
+ if (StringUtils.hasText(supplyDto.getBusinessAddress())) {
+ queryWrapper.like(Supply::getBusinessAddress, supplyDto.getBusinessAddress());
+ }
}
-
- // 绾崇◣浜鸿瘑鍒彿绮剧‘鏌ヨ
- if (StringUtils.hasText(supplyDto.getTaxpayerId())) {
- queryWrapper.eq(Supply::getTaxpayerId, supplyDto.getTaxpayerId());
- }
-
+ // 榛樿鎸夊垱寤烘椂闂村�掑簭鎺掑垪
queryWrapper.orderByDesc(Supply::getCreateTime);
return supplyMapper.selectPage(page, queryWrapper);
}
@@ -65,13 +78,16 @@
if (ids == null || ids.length == 0) {
return 0;
}
-
// 鏋勯�犳洿鏂版潯浠�
UpdateWrapper<Supply> updateWrapper = new UpdateWrapper<>();
updateWrapper.in("id", ids)
.set("deleted", 1); // 璁剧疆 deleted 涓� 1 琛ㄧず宸插垹闄�
-
// 鎵ц鎵归噺閫昏緫鍒犻櫎
return supplyMapper.update(null, updateWrapper);
}
+
+ @Override
+ public List<Supply> supplyList() {
+ return supplyMapper.selectList(null);
+ }
}
--
Gitblit v1.9.3