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
567ef88c
Commit
567ef88c
authored
Jun 11, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):个人主体新增撬装式压力容器时过滤出了气瓶,应该只保留固定式压力容器
parent
bd990199
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+2
-1
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
View file @
567ef88c
...
...
@@ -507,9 +507,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
}
// 初始化collect列表
List
<
DictionarieValueModel
>
collect
=
new
ArrayList
<>();
// 使用单位 包含 企业的使用单位类型 or 个人主体
// 使用单位 && 业务场景businessScenarios为1(场景选择)&& 设备种类为2000(压力容器) =》 设备类别只保留固定式压力容器(2100)
// 使用单位 && 业务场景businessScenarios为0(场景选择)&& 设备种类为2000(压力容器) =》 设备类别排除固定式压力容器(2100)
boolean
shouldInclude2100
=
CompanyTypeEnum
.
USE
.
getName
().
equals
(
companyType
)
&&
"1"
.
equals
(
businessScenarios
)
&&
"2000"
.
equals
(
equList
);
boolean
shouldInclude2100
=
(
CompanyTypeEnum
.
USE
.
getName
().
equals
(
companyType
)
||
CompanyTypeEnum
.
INDIVIDUAL
.
getName
().
equals
(
companyType
)
)
&&
"1"
.
equals
(
businessScenarios
)
&&
"2000"
.
equals
(
equList
);
collect
=
result
.
stream
()
.
filter
(
x
->
shouldInclude2100
==
"2100"
.
equals
(
x
.
getDictDataKey
()))
.
collect
(
Collectors
.
toList
());
...
...
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