From 82402ef5ae74acd08815005cec52d9a959ddea06 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 28 三月 2026 13:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dhdc' into dhdc
---
src/main/java/com/ruoyi/basic/pojo/Customer.java | 4 ++++
src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java | 8 +++++++-
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 4 ++++
3 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java
index 9e9269f..8a08baa 100644
--- a/src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java
@@ -1,11 +1,13 @@
package com.ruoyi.account.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.mapper.EnterpriseFixedAssetsMapper;
import com.ruoyi.account.pojo.EnterpriseFixedAssets;
import com.ruoyi.account.service.EnterpriseFixedAssetsService;
+import com.ruoyi.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +21,10 @@
@Override
public IPage<EnterpriseFixedAssets> listPage(Page<EnterpriseFixedAssets> page, EnterpriseFixedAssets enterpriseFixedAssets) {
- return enterpriseFixedAssetsmapper.selectPage(page, null);
+ LambdaQueryWrapper<EnterpriseFixedAssets> queryWrapper = new LambdaQueryWrapper<>();
+ if (enterpriseFixedAssets != null && StringUtils.isNotBlank(enterpriseFixedAssets.getName())) {
+ queryWrapper.like(EnterpriseFixedAssets::getName, enterpriseFixedAssets.getName());
+ }
+ return enterpriseFixedAssetsmapper.selectPage(page, queryWrapper);
}
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index d1cd35b..fb580ef 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -35,6 +35,10 @@
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
+ /** 瀹㈡埛鍒嗙被锛氶浂鍞鎴凤紝杩涢攢鍟嗗鎴� */
+ @Excel(name = "瀹㈡埛鍒嗙被")
+ private String customerType;
+
/**
* 绾崇◣浜鸿瘑鍒彿
*/
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index 137af19..521b093 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -75,9 +75,13 @@
// 2. 鏋勫缓鏌ヨ鏉′欢锛堝寮虹┖鍊煎畨鍏級
LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
String customerName = customer.getCustomerName();
+ String customerType = customer.getCustomerType();
if (StringUtils.isNotBlank(customerName)) {
queryWrapper.like(Customer::getCustomerName, customerName);
}
+ if (StringUtils.isNotBlank(customerType)) {
+ queryWrapper.like(Customer::getCustomerType, customerType);
+ }
// 3. 鎵ц鍒嗛〉鏌ヨ锛堜繚鐣欏垎椤靛厓鏁版嵁锛�
IPage<Customer> customerPage = customerMapper.selectPage(page, queryWrapper);
--
Gitblit v1.9.3