From 5845950aa395da1a1f56a5fff4c80358cf4b5f7f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 五月 2023 21:03:56 +0800
Subject: [PATCH] 新增引用码段下的参照配置界面,代码整合

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPJLambdaUtil.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPLLambdaUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPJLambdaUtil.java
similarity index 73%
rename from Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPLLambdaUtil.java
rename to Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPJLambdaUtil.java
index f6f584d..99e6480 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPLLambdaUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPJLambdaUtil.java
@@ -1,12 +1,10 @@
 package com.vci.ubcs.starter.util;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.mp.support.SqlKeyword;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
@@ -14,9 +12,9 @@
 
 import java.util.Map;
 
-public class Map2MPLLambdaUtil {
+public class Map2MPJLambdaUtil {
 
-	public Map2MPLLambdaUtil() {
+	public Map2MPJLambdaUtil() {
 	}
 
 	public static <T> IPage<T> getPage(Query query) {
@@ -52,6 +50,11 @@
 		return getMPJLambdaWrapper(query, exclude, clazz);
 	}
 
+	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapperByMapString(Map<String, String> query, Class<T> clazz) {
+		Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
+		return getMPJLambdaWrapperByMapString(query, exclude, clazz);
+	}
+
 	/**
 	 * map杞崲涓篗PJLambdaWrapper
 	 * @param query
@@ -70,5 +73,15 @@
 		return qw;
 	}
 
+	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapperByMapString(Map<String, String> query, Map<String, Object> exclude, Class<T> clazz) {
+		exclude.forEach((k, v) -> {
+			query.remove(k);
+		});
+		MPJLambdaWrapper<T> qw = new MPJLambdaWrapper();
+		qw.setEntity(BeanUtil.newInstance(clazz));
+		MPJLambdaWrapperSqlKeyword.buildConditionByMapString(query, qw);
+		return qw;
+	}
+
 
 }

--
Gitblit v1.9.3