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

Merge remote-tracking branch 'remotes/origin/20260204'

Browse Source 
# Conflicts:
#	lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.class
#	lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/codegen/CodegenConvertImpl.java
#	lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/config/ConfigConvertImpl.java
#	lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/file/FileConfigConvertImpl.java
#	lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/redis/RedisConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/auth/AuthConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/logger/OperateLogConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/mail/MailAccountConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/oauth2/OAuth2OpenConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/social/SocialUserConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/tenant/TenantConvertImpl.java
#	lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/user/UserConvertImpl.java
This commit is contained in:
chy
2026-02-05 13:15:03 +08:00
parent 92674cff52 b7ebd3778d
commit 81bc9757eb
16 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/新建 文本文档.txt
View File

@@ -1,3 +1 @@
yunji_report_field 新增is_amount字段
111111111

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

@@ -1066,6 +1066,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.

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {
}

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {
}

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

@@ -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 {
}

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

@@ -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 {

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

@@ -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 {
}

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

@@ -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 {
}