From 014270352f8e19b51bbb4367ae2ff256050a30a2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 14:03:42 +0800
Subject: [PATCH] #修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
index ea2e93f..7cb5cfb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
@@ -98,10 +98,13 @@
if (this.isToUnderlineCase) {
key = Utils.toSymbolCase(key, '_');
}
+ String finalKey = key;
if (like && key.contains(timeField)) {
- queryWrapper.like("`" + key + "`", val);
+ queryWrapper.and(wrapper -> wrapper.like("`" + finalKey + "`", val));
+// queryWrapper.like("`" + key + "`", val);
} else {
- queryWrapper.eq("`" + key + "`", val);
+ queryWrapper.and(wrapper -> wrapper.eq("`" + finalKey + "`", val));
+// queryWrapper.eq("`" + key + "`", val);
}
}
}
@@ -148,16 +151,17 @@
columns.add(column);
}
if (!columns.isEmpty()) {
- for (int i=0;i<columns.size();i++){
- String column = columns.get(i);
- String condition = where.getCondition();
-
- if (i == 0) {
- queryWrapper.and(wrapper -> wrapper.like("`" + column + "`", condition));
- } else {
- queryWrapper.or().like("`" + column + "`", condition);
+ queryWrapper.and(wrapper -> {
+ for (int i=0;i<columns.size();i++){
+ String column = columns.get(i);
+ String condition = where.getCondition();
+ if (i == 0) {
+ wrapper.or().like("`" + column + "`", condition);
+ } else {
+ wrapper.or().like("`" + column + "`", condition);
+ }
}
- }
+ });
}
}
return queryWrapper;
@@ -236,17 +240,30 @@
String column = Utils.toSymbolCase(field.getName(), '_');
columns.add(column);
}
+// if (!columns.isEmpty()) {
+// for (int i=0;i<columns.size();i++){
+// String column = columns.get(i);
+// String condition = where.getCondition();
+//
+// if (i == 0) {
+// queryWrapper.and(wrapper -> wrapper.like("`" + column + "`", condition));
+// } else {
+// queryWrapper.or().like("`" + column + "`", condition);
+// }
+// }
+// }
if (!columns.isEmpty()) {
- for (int i=0;i<columns.size();i++){
- String column = columns.get(i);
- String condition = where.getCondition();
-
- if (i == 0) {
- queryWrapper.and(wrapper -> wrapper.like("`" + column + "`", condition));
- } else {
- queryWrapper.or().like("`" + column + "`", condition);
+ queryWrapper.and(wrapper -> {
+ for (int i=0;i<columns.size();i++){
+ String column = columns.get(i);
+ String condition = where.getCondition();
+ if (i == 0) {
+ wrapper.or().like("`" + column + "`", condition);
+ } else {
+ wrapper.or().like("`" + column + "`", condition);
+ }
}
- }
+ });
}
}
return queryWrapper;
--
Gitblit v1.9.1