From e14d495581896374cc4be7ec929feb95005e6563 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 15 六月 2023 18:22:39 +0800
Subject: [PATCH] 修改系统管理、编码规则管理bug
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java | 71 +++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
index f4016c1..e9e9392 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
@@ -9,7 +9,7 @@
import java.util.Map;
/**
- * UBCSSqlKeyword
+ * UBCSSqlKeyword,楂樼骇鏌ヨ涓嶄紶鐨勬椂鍊欓粯璁ゆ槸_equal
* map杞瑆rapper鏃剁敤鍒扮殑姣斿杞崲
* @author ludc
* @date 2023/06/06 10:01
@@ -43,8 +43,8 @@
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
- if (k.endsWith("_equal")) {
- qw.eq(getColumn(k, "_equal"), v);
+ if (k.endsWith("_like")) {
+ qw.like(getColumn(k, "_like"), v);
} else if (k.endsWith("_notequal")) {
qw.ne(getColumn(k, "_notequal"), v);
} else if (k.endsWith("_likeleft")) {
@@ -76,65 +76,74 @@
} else if (k.endsWith("_notnull")) {
qw.isNotNull(getColumn(k, "_notnull"));
} else {
- qw.like(getColumn(k, "_like"), v);
+ qw.eq(getColumn(k, "_equal"), v);
}
}
});
}
+ }
+
+ public static void buildConditionByAs(Map<String, Object> query, MPJLambdaWrapper<?> qw, String tableAlias){
+ buildConditionMPJ(query,qw,tableAlias);
}
public static void buildCondition(Map<String, Object> query, MPJLambdaWrapper<?> qw) {
+ buildConditionMPJ(query,qw,null);
+ }
+
+ private static void buildConditionMPJ(Map<String, Object> query, MPJLambdaWrapper<?> qw, String tableAlias){
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
- if (k.endsWith("_equal")) {
- qw.eq(getColumn(k, "_equal"), v);
+ if (k.endsWith("_like")) {
+ qw.like(tableAlias+"."+getColumn(k, "_like"), v);
} else if (k.endsWith("_notequal")) {
- qw.ne(getColumn(k, "_notequal"), v);
+ qw.ne(tableAlias+"."+getColumn(k, "_notequal"), v);
} else if (k.endsWith("_likeleft")) {
- qw.likeLeft(getColumn(k, "_likeleft"), v);
+ qw.likeLeft(tableAlias+"."+getColumn(k, "_likeleft"), v);
} else if (k.endsWith("_likeright")) {
- qw.likeRight(getColumn(k, "_likeright"), v);
+ qw.likeRight(tableAlias+"."+getColumn(k, "_likeright"), v);
} else if (k.endsWith("_notlike")) {
- qw.notLike(getColumn(k, "_notlike"), v);
+ qw.notLike(tableAlias+"."+getColumn(k, "_notlike"), v);
} else if (k.endsWith("_ge")) {
- qw.ge(getColumn(k, "_ge"), v);
+ qw.ge(tableAlias+"."+getColumn(k, "_ge"), v);
} else if (k.endsWith("_le")) {
- qw.le(getColumn(k, "_le"), v);
+ qw.le(tableAlias+"."+getColumn(k, "_le"), v);
} else if (k.endsWith("_gt")) {
- qw.gt(getColumn(k, "_gt"), v);
+ qw.gt(tableAlias+"."+getColumn(k, "_gt"), v);
} else if (k.endsWith("_lt")) {
- qw.lt(getColumn(k, "_lt"), v);
+ qw.lt(tableAlias+"."+getColumn(k, "_lt"), v);
} else if (k.endsWith("_datege")) {
- qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ qw.ge(tableAlias+"."+getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
} else if (k.endsWith("_dategt")) {
- qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ qw.gt(tableAlias+"."+getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
} else if (k.endsWith("_dateequal")) {
- qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ qw.eq(tableAlias+"."+getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
} else if (k.endsWith("_datele")) {
- qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ qw.le(tableAlias+"."+getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
} else if (k.endsWith("_datelt")) {
- qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ qw.lt(tableAlias+"."+getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
} else if (k.endsWith("_null")) {
- qw.isNull(getColumn(k, "_null"));
+ qw.isNull(tableAlias+"."+getColumn(k, "_null"));
} else if (k.endsWith("_notnull")) {
- qw.isNotNull(getColumn(k, "_notnull"));
+ qw.isNotNull(tableAlias+"."+getColumn(k, "_notnull"));
} else {
- qw.like(getColumn(k, "_like"), v);
+ qw.eq(tableAlias+"."+getColumn(k, "_equal"), v);
}
}
});
}
}
+
public static void buildConditionByMapString(Map<String, String> query, MPJLambdaWrapper<?> qw) {
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
- if (k.endsWith("_equal")) {
- qw.eq(getColumn(k, "_equal"), v);
+ if (k.endsWith("_like")) {
+ qw.like(getColumn(k, "_like"), v);
} else if (k.endsWith("_notequal")) {
qw.ne(getColumn(k, "_notequal"), v);
} else if (k.endsWith("_likeleft")) {
@@ -166,7 +175,7 @@
} else if (k.endsWith("_notnull")) {
qw.isNotNull(getColumn(k, "_notnull"));
} else {
- qw.like(getColumn(k, "_like"), v);
+ qw.eq(getColumn(k, "_equal"), v);
}
}
@@ -178,8 +187,8 @@
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
- if (k.endsWith("_equal")) {
- qw.eq(getColumn(k, "_equal"), v);
+ if (k.endsWith("_like")) {
+ qw.like(getColumn(k, "_like"), v);
} else if (k.endsWith("_notequal")) {
qw.ne(getColumn(k, "_notequal"), v);
} else if (k.endsWith("_likeleft")) {
@@ -211,7 +220,7 @@
} else if (k.endsWith("_notnull")) {
qw.isNotNull(getColumn(k, "_notnull"));
} else {
- qw.like(getColumn(k, "_like"), v);
+ qw.eq(getColumn(k, "_equal"), v);
}
}
@@ -219,6 +228,12 @@
}
}
+ /**
+ * 鑾峰彇鍒楀悕锛屾病鏈夎浆涓嬪垝绾挎槧灏�
+ * @param column
+ * @param keyword
+ * @return
+ */
private static String getColumn(String column, String keyword) {
//娌℃湁杞笅鍒掔嚎鏄犲皠
return StringUtil.removeSuffix(column, keyword).toLowerCase(Locale.ROOT);
--
Gitblit v1.9.3