admin/gr_report_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Signed-off-by: dongpx <2112323174@qq.com>

Browse Source
This commit is contained in:
dongpx
2026-02-05 10:37:57 +08:00
parent a1c91f2959
commit b7ebd3778d
15 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java
View File

@@ -1069,6 +1069,9 @@ public class FrameServiceImpl implements IFrameService {
List<Map<String, String>> whereFieldMapList = lideeYunJiMapper.getReportWhereFieldList(reportEntity.getId());
Func.handleWhere(whereFieldMapList, queryWrapper, params);
//处理分组group by=================
Func.handleGroupBy(queryWrapper, params);
return queryWrapper;
}

14
lidee-core/src/main/java/com/lideeyunji/core/framework/utils/Func.java
View File

@@ -906,6 +906,15 @@ public class Func extends FuncBase {
return formatAreaStr(jsonStr);
}
//处理分组
public static void handleGroupBy(SqlInfoQueryWrapper.Wrapper wrapper, Map<String, Object> params){
}
//处理排序
public static void handleOrderBy(SqlInfoQueryWrapper.Wrapper wrapper, Map<String, Object> 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);
}
}

BIN
lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.class
View File

Binary file not shown.

BIN
lidee-core/target/classes/com/lideeyunji/core/framework/utils/Func.class
View File

Binary file not shown.

2
lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/codegen/CodegenConvertImpl.java
View File

@@ -12,7 +12,7 @@ import org.apache.ibatis.type.JdbcType;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-02-02T00:49:12+0800",
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 {

2
lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/config/ConfigConvertImpl.java
View File

@@ -10,7 +10,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-02-02T00:49:12+0800",
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 {

2
lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/file/FileConfigConvertImpl.java
View File

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-02-02T00:49:12+0800",
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 {

2
lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/redis/RedisConvertImpl.java
View File

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-02-02T00:49:12+0800",
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 {

2
lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/auth/AuthConvertImpl.java
View File

@@ -14,7 +14,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-02-02T00:49:16+0800",
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 {

2
lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/logger/OperateLogConvertImpl.java
View File

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-02-02T00:49:16+0800",
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 {

2
lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/mail/MailAccountConvertImpl.java
View File

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-02-02T00:49:16+0800",
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 {

2
lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/oauth2/OAuth2OpenConvertImpl.java
View File

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-02-02T00:49:16+0800",
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 {

2
lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/social/SocialUserConvertImpl.java
View File

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-02-02T00:49:16+0800",
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 {

2
lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/tenant/TenantConvertImpl.java
View File

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-02-02T00:49:16+0800",
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 {

2
lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/user/UserConvertImpl.java
View File

@@ -4,7 +4,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2026-02-02T00:49:16+0800",
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 {