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
aa38029c
Commit
aa38029c
authored
Jul 16, 2024
by
李松
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
8af18f07
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+7
-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 @
aa38029c
...
@@ -546,12 +546,18 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
...
@@ -546,12 +546,18 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
public
List
<
DictionarieValueModel
>
equCategoryListByCompanyType
(
ReginParams
selectedOrgInfo
,
String
equList
,
String
businessScenarios
,
String
dataSource
,
String
type
)
{
public
List
<
DictionarieValueModel
>
equCategoryListByCompanyType
(
ReginParams
selectedOrgInfo
,
String
equList
,
String
businessScenarios
,
String
dataSource
,
String
type
)
{
// 历史设备录入 直接取所有的设备种类(equList)下的所有设备类别
// 历史设备录入 直接取所有的设备种类(equList)下的所有设备类别
if
(
"his"
.
equals
(
dataSource
))
{
if
(
"his"
.
equals
(
dataSource
))
{
// 历史数据导入设备类别限制
// 历史数据导入设备类别限制
bug-21172
if
(!
ObjectUtils
.
isEmpty
(
type
)
&&
"PL_DR"
.
equals
(
type
)){
if
(!
ObjectUtils
.
isEmpty
(
type
)
&&
"PL_DR"
.
equals
(
type
)){
return
this
.
baseMapper
.
queryAllEquCategoriesUnderTheEquList
(
equList
).
stream
()
return
this
.
baseMapper
.
queryAllEquCategoriesUnderTheEquList
(
equList
).
stream
()
.
filter
(
x
->
"2300"
.
equals
(
x
.
getDictDataKey
()))
.
filter
(
x
->
"2300"
.
equals
(
x
.
getDictDataKey
()))
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
}
}
// 历史数据新增设备类别限制 bug-21139
if
(!
ObjectUtils
.
isEmpty
(
equList
)
&&
"8000"
.
equals
(
equList
)){
return
this
.
baseMapper
.
queryAllEquCategoriesUnderTheEquList
(
equList
).
stream
()
.
filter
(
x
->
"8300"
.
equals
(
x
.
getDictDataKey
()))
.
collect
(
Collectors
.
toList
());
}
return
this
.
baseMapper
.
queryAllEquCategoriesUnderTheEquList
(
equList
);
return
this
.
baseMapper
.
queryAllEquCategoriesUnderTheEquList
(
equList
);
}
}
...
...
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