Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
695de329
Commit
695de329
authored
Jul 02, 2025
by
麻笑宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(statistics): 修复自定义过滤器查询返回值类型
- 将 TzsCustomFilterMapper.xml 中 queryEquCategory 方法的 resultType 从 JSONArray 改为 JSONObject- 在 UnitTypeEnum.java 中修正了 value 和 key 的赋值,使用 code 替代 name
parent
cfac6ed7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
UnitTypeEnum.java
...n/amos/boot/module/statistics/api/enums/UnitTypeEnum.java
+1
-1
TzsCustomFilterMapper.xml
...s-api/src/main/resources/mapper/TzsCustomFilterMapper.xml
+1
-1
No files found.
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/UnitTypeEnum.java
View file @
695de329
...
@@ -43,7 +43,7 @@ public enum UnitTypeEnum {
...
@@ -43,7 +43,7 @@ public enum UnitTypeEnum {
for
(
UnitTypeEnum
e
:
UnitTypeEnum
.
values
())
{
for
(
UnitTypeEnum
e
:
UnitTypeEnum
.
values
())
{
JSONObject
jsonObject
=
new
JSONObject
();
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
.
put
(
"label"
,
e
.
name
);
jsonObject
.
put
(
"label"
,
e
.
name
);
jsonObject
.
put
(
"value"
,
e
.
nam
e
);
jsonObject
.
put
(
"value"
,
e
.
cod
e
);
jsonObject
.
put
(
"key"
,
e
.
code
);
jsonObject
.
put
(
"key"
,
e
.
code
);
jsonArray
.
add
(
jsonObject
);
jsonArray
.
add
(
jsonObject
);
}
}
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/TzsCustomFilterMapper.xml
View file @
695de329
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
where parent_id = #{parentId}
where parent_id = #{parentId}
</select>
</select>
<select
id=
"queryEquCategory"
resultType=
"com.alibaba.fastjson.JSON
Array
"
>
<select
id=
"queryEquCategory"
resultType=
"com.alibaba.fastjson.JSON
Object
"
>
SELECT
SELECT
code AS value,
code AS value,
code AS key,
code AS key,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment