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
743386d9
Commit
743386d9
authored
Sep 18, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(统计):人员统计bug
parent
b0cd42cc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
UnitTypeEnum.java
...ejoin/amos/boot/module/common/api/enums/UnitTypeEnum.java
+2
-1
ZLStatisticsMapper.xml
...tics-api/src/main/resources/mapper/ZLStatisticsMapper.xml
+1
-0
No files found.
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/UnitTypeEnum.java
View file @
743386d9
...
@@ -4,7 +4,6 @@ import lombok.Getter;
...
@@ -4,7 +4,6 @@ import lombok.Getter;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.EnumSet
;
import
java.util.EnumSet
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
@Getter
@Getter
...
@@ -18,6 +17,8 @@ public enum UnitTypeEnum {
...
@@ -18,6 +17,8 @@ public enum UnitTypeEnum {
AGWDW
(
"安装改造维修单位"
,
"1234"
,
"1"
),
AGWDW
(
"安装改造维修单位"
,
"1234"
,
"1"
),
//使用单位
//使用单位
SYDW
(
"使用单位"
,
"1232"
,
"2"
),
SYDW
(
"使用单位"
,
"1232"
,
"2"
),
//使用单位
GRZT
(
"个人主体"
,
"6601"
,
"2"
),
//充装单位
//充装单位
CZDW
(
"充装单位"
,
"1231"
,
"3"
),
CZDW
(
"充装单位"
,
"1231"
,
"3"
),
//检验检测机构
//检验检测机构
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/ZLStatisticsMapper.xml
View file @
743386d9
...
@@ -62,6 +62,7 @@
...
@@ -62,6 +62,7 @@
WHERE
WHERE
bi.unit_type IS NOT NULL
bi.unit_type IS NOT NULL
AND tui.post IS NOT NULL
AND tui.post IS NOT NULL
AND tui.is_delete = 'f'
<if
test=
"unitTypeList != null and unitTypeList.size() > 0"
>
<if
test=
"unitTypeList != null and unitTypeList.size() > 0"
>
AND
AND
<foreach
collection=
"unitTypeList"
item=
"unitType"
open=
"("
separator=
"OR"
close=
")"
>
<foreach
collection=
"unitTypeList"
item=
"unitType"
open=
"("
separator=
"OR"
close=
")"
>
...
...
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