From 2674d6e7b9340948656422d9e4aaf64954949723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=86=B0=E5=86=B0=E5=89=8D=E7=94=B7=E5=8F=8B?=
 <761206624@qq.com>
Date: Thu, 11 Aug 2022 16:15:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=9E=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=88=86=E7=BB=84=E6=8C=87=E5=AE=9A=E5=88=AB=E5=90=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               |  2 +-
 .../github/yulichang/wrapper/MPJLambdaWrapper.java    | 11 +++++++++++
 .../yulichang/wrapper/enums/DefaultFuncEnum.java      |  3 ++-
 .../com/github/yulichang/wrapper/interfaces/Func.java |  2 ++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index dfaf71b..0c388f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.yulichang</groupId>
     <artifactId>mybatis-plus-join</artifactId>
-    <version>1.2.6</version>
+    <version>1.2.7</version>
     <name>mybatis-plus-join</name>
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
     <url>https://github.com/yulichang/mybatis-plus-join</url>
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<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
         return typedThis;
     }
 
+    @Override
+    public <R> MPJLambdaWrapper<T> 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<Children> extends Serializable {
      */
     <R> Children groupBy(boolean condition, List<SFunction<R, ?>> columns);
 
+    <R> Children groupBy(String... columns);
+
     /**
      * ignore
      */