diff --git a/doc/新建 文本文档.txt b/doc/新建 文本文档.txt index 136bd1c..34266f5 100644 --- a/doc/新建 文本文档.txt +++ b/doc/新建 文本文档.txt @@ -1,3 +1 @@ -yunji_report_field 新增is_amount字段 - -111111111 \ No newline at end of file +yunji_report_field 新增is_amount字段 \ No newline at end of file diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java index af140f0..abaff4c 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java @@ -1066,6 +1066,9 @@ public class FrameServiceImpl implements IFrameService { List> whereFieldMapList = lideeYunJiMapper.getReportWhereFieldList(reportEntity.getId()); Func.handleWhere(whereFieldMapList, queryWrapper, params); + //处理分组group by================= + Func.handleGroupBy(queryWrapper, params); + return queryWrapper; } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/utils/Func.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/utils/Func.java index 3ecc629..348a2a1 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/utils/Func.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/utils/Func.java @@ -906,6 +906,15 @@ public class Func extends FuncBase { return formatAreaStr(jsonStr); } + //处理分组 + public static void handleGroupBy(SqlInfoQueryWrapper.Wrapper wrapper, Map params){ + + + + } + + + //处理排序 public static void handleOrderBy(SqlInfoQueryWrapper.Wrapper wrapper, Map params, String orderbyConfigStr) { @@ -1138,6 +1147,11 @@ public class Func extends FuncBase { }); } } + if(params.containsKey("Group by")){ + String[] str=params.get("Group by").toString().split(","); + wrapper.groupByColumns(str); + } + } diff --git a/lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.class b/lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.class index cafdec3..e6bb7d1 100644 Binary files a/lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.class and b/lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.class differ diff --git a/lidee-core/target/classes/com/lideeyunji/core/framework/utils/Func.class b/lidee-core/target/classes/com/lideeyunji/core/framework/utils/Func.class index 13971df..fc94378 100644 Binary files a/lidee-core/target/classes/com/lideeyunji/core/framework/utils/Func.class and b/lidee-core/target/classes/com/lideeyunji/core/framework/utils/Func.class differ diff --git a/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/codegen/CodegenConvertImpl.java b/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/codegen/CodegenConvertImpl.java index 85708c4..4438ee8 100644 --- a/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/codegen/CodegenConvertImpl.java +++ b/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/codegen/CodegenConvertImpl.java @@ -12,8 +12,8 @@ import org.apache.ibatis.type.JdbcType; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-02-05T07:33:46+0800", - comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)" + date = "2026-02-04T12:27:21+0800", + comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class CodegenConvertImpl implements CodegenConvert { diff --git a/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/config/ConfigConvertImpl.java b/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/config/ConfigConvertImpl.java index 8a16201..bf4ad4c 100644 --- a/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/config/ConfigConvertImpl.java +++ b/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/config/ConfigConvertImpl.java @@ -10,8 +10,8 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-02-05T07:33:46+0800", - comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)" + date = "2026-02-04T12:27:21+0800", + comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class ConfigConvertImpl implements ConfigConvert { diff --git a/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/file/FileConfigConvertImpl.java b/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/file/FileConfigConvertImpl.java index 1c53a8d..0a935ba 100644 --- a/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/file/FileConfigConvertImpl.java +++ b/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/file/FileConfigConvertImpl.java @@ -6,8 +6,8 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-02-05T07:33:46+0800", - comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)" + date = "2026-02-04T12:27:20+0800", + comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class FileConfigConvertImpl implements FileConfigConvert { diff --git a/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/redis/RedisConvertImpl.java b/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/redis/RedisConvertImpl.java index 6d8dcef..a03c398 100644 --- a/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/redis/RedisConvertImpl.java +++ b/lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/redis/RedisConvertImpl.java @@ -4,8 +4,8 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-02-05T07:33:46+0800", - comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)" + date = "2026-02-04T12:27:20+0800", + comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class RedisConvertImpl implements RedisConvert { } diff --git a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/auth/AuthConvertImpl.java b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/auth/AuthConvertImpl.java index f328305..761ca34 100644 --- a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/auth/AuthConvertImpl.java +++ b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/auth/AuthConvertImpl.java @@ -14,8 +14,8 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-02-05T07:33:29+0800", - comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)" + date = "2026-02-04T12:27:28+0800", + comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class AuthConvertImpl implements AuthConvert { diff --git a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/logger/OperateLogConvertImpl.java b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/logger/OperateLogConvertImpl.java index 1a6d29b..6876d2d 100644 --- a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/logger/OperateLogConvertImpl.java +++ b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/logger/OperateLogConvertImpl.java @@ -6,8 +6,8 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-02-05T07:33:29+0800", - comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)" + date = "2026-02-04T12:27:28+0800", + comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class OperateLogConvertImpl implements OperateLogConvert { diff --git a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/mail/MailAccountConvertImpl.java b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/mail/MailAccountConvertImpl.java index 5729058..86933e0 100644 --- a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/mail/MailAccountConvertImpl.java +++ b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/mail/MailAccountConvertImpl.java @@ -4,8 +4,8 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-02-05T07:33:29+0800", - comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)" + date = "2026-02-04T12:27:28+0800", + comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class MailAccountConvertImpl implements MailAccountConvert { } diff --git a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/oauth2/OAuth2OpenConvertImpl.java b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/oauth2/OAuth2OpenConvertImpl.java index 18645dc..398ed55 100644 --- a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/oauth2/OAuth2OpenConvertImpl.java +++ b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/oauth2/OAuth2OpenConvertImpl.java @@ -4,8 +4,8 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-02-05T07:33:29+0800", - comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)" + date = "2026-02-04T12:27:28+0800", + comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class OAuth2OpenConvertImpl implements OAuth2OpenConvert { } diff --git a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/social/SocialUserConvertImpl.java b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/social/SocialUserConvertImpl.java index 24a6516..68f2e86 100644 --- a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/social/SocialUserConvertImpl.java +++ b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/social/SocialUserConvertImpl.java @@ -6,8 +6,8 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-02-05T07:33:29+0800", - comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)" + date = "2026-02-04T12:27:28+0800", + comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class SocialUserConvertImpl implements SocialUserConvert { diff --git a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/tenant/TenantConvertImpl.java b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/tenant/TenantConvertImpl.java index 51d19e1..b0b1976 100644 --- a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/tenant/TenantConvertImpl.java +++ b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/tenant/TenantConvertImpl.java @@ -4,8 +4,8 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-02-05T07:33:29+0800", - comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)" + date = "2026-02-04T12:27:28+0800", + comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class TenantConvertImpl implements TenantConvert { } diff --git a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/user/UserConvertImpl.java b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/user/UserConvertImpl.java index 5e1003d..e1d4db7 100644 --- a/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/user/UserConvertImpl.java +++ b/lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/user/UserConvertImpl.java @@ -4,8 +4,8 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-02-05T07:33:29+0800", - comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_391 (Oracle Corporation)" + date = "2026-02-04T12:27:28+0800", + comments = "version: 1.5.5.Final, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class UserConvertImpl implements UserConvert { }