diff --git a/pom.xml b/pom.xml index dfaf71b..0c388f4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.github.yulichang mybatis-plus-join - 1.2.6 + 1.2.7 mybatis-plus-join An enhanced toolkit of Mybatis-Plus to simplify development. https://github.com/yulichang/mybatis-plus-join diff --git a/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java index 95bcbea..5fe2382 100644 --- a/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java +++ b/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java @@ -23,6 +23,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Predicate; import java.util.stream.Collectors; +import static com.baomidou.mybatisplus.core.enums.SqlKeyword.GROUP_BY; + /** * 参考 {@link com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper} * Lambda 语法使用 Wrapper @@ -277,6 +279,15 @@ public class MPJLambdaWrapper extends MPJAbstractLambdaWrapper MPJLambdaWrapper groupBy(String... columns) { + return maybeDo(true, () -> { + final String finalOne = String.join(StringPool.COMMA, columns); + ; + appendSqlSegments(GROUP_BY, () -> finalOne); + }); + } + /** * select字段 */ diff --git a/src/main/java/com/github/yulichang/wrapper/enums/DefaultFuncEnum.java b/src/main/java/com/github/yulichang/wrapper/enums/DefaultFuncEnum.java index 74ff529..b40f39e 100644 --- a/src/main/java/com/github/yulichang/wrapper/enums/DefaultFuncEnum.java +++ b/src/main/java/com/github/yulichang/wrapper/enums/DefaultFuncEnum.java @@ -12,7 +12,8 @@ package com.github.yulichang.wrapper.enums; * @author yulichang */ public enum DefaultFuncEnum implements BaseFuncEnum { - + DATE_FORMAT_Y_M_D("DATE_FORMAT(%s,'%%Y-%%m-%%d')"), + DATE_FORMAT_Y_M("DATE_FORMAT(%s,'%%Y-%%m')"), SUM("SUM(%s)"), COUNT("COUNT(%s)"), COUNT_DISTINCT("COUNT(DISTINCT %s)"), diff --git a/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java b/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java index abbecba..3695498 100644 --- a/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java +++ b/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java @@ -187,6 +187,8 @@ public interface Func extends Serializable { */ Children groupBy(boolean condition, List> columns); + Children groupBy(String... columns); + /** * ignore */