From f29c8786807015d78b9be8a33397f69478d92a76 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 12 七月 2025 16:52:27 +0800
Subject: [PATCH] 1.设备优化 2.配煤计算器
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java
index e01e082..73d18d2 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java
@@ -16,6 +16,7 @@
import java.util.List;
import java.util.Objects;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -39,8 +40,8 @@
@Override
public IPage<CoalField> selectCoalFieldList(Page page, CoalFieldDto coalFieldDto) {
LambdaQueryWrapper<CoalField> queryWrapper = new LambdaQueryWrapper<>();
- if (StringUtils.hasText(coalFieldDto.getFieldName())) {
- queryWrapper.like(CoalField::getFieldName, coalFieldDto.getFieldName());
+ if (StringUtils.hasText(coalFieldDto.getSearchAll())) {
+ queryWrapper.like(CoalField::getFieldName, coalFieldDto.getSearchAll());
}
queryWrapper.orderByDesc(CoalField::getCreateTime);
return coalFieldMapper.selectPage(page, queryWrapper);
@@ -80,6 +81,11 @@
return coalFieldMapper.selectList(null);
}
+ @Override
+ public Set<String> getFieldNamesByNames(Set<String> fieldNames) {
+ return coalFieldMapper.getFieldNamesByNames(fieldNames);
+ }
+
private String generateNextFieldNumber() {
// 鑾峰彇鎵�鏈夊凡瀛樺湪鐨� CoalField 璁板綍锛屽寘鎷凡鍒犻櫎鐨�
LambdaQueryWrapper<CoalField> queryWrapper = new LambdaQueryWrapper<>();
--
Gitblit v1.9.3