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
06e09d72
Commit
06e09d72
authored
Apr 23, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(JG):车用气瓶-内部编码多个问题处理
parent
7ffc8fe3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
3 deletions
+17
-3
JgVehicleInformationServiceImpl.java
.../jg/biz/service/impl/JgVehicleInformationServiceImpl.java
+17
-3
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/JgVehicleInformationServiceImpl.java
View file @
06e09d72
...
...
@@ -907,9 +907,22 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
populateEquipmentInformation
(
registerInfoList
,
exportParamsMap
);
}
IdxBizJgUseInfo
useInfo
=
idxBizJgUseInfoService
.
getOneData
(
vehicleInformationEqList
.
get
(
0
).
getEquId
());
if
(
useInfo
!=
null
&&
useInfo
.
getUseInnerCode
()
!=
null
)
{
exportParamsMap
.
put
(
"useInnerCode"
,
useInfo
.
getUseInnerCode
());
//IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(vehicleInformationEqList.get(0).getEquId());
//if (useInfo != null && useInfo.getUseInnerCode() != null) {
// exportParamsMap.put("useInnerCode", useInfo.getUseInnerCode());
//}
List
<
IdxBizJgUseInfo
>
userInfoList
=
idxBizJgUseInfoService
.
list
(
new
QueryWrapper
<
IdxBizJgUseInfo
>().
in
(
"RECORD"
,
vehicleInformationEqList
.
stream
()
.
map
(
JgVehicleInformationEq:
:
getEquId
)
.
filter
(
Objects:
:
nonNull
)
.
collect
(
Collectors
.
toList
())));
if
(!
ValidationUtil
.
isEmpty
(
userInfoList
))
{
exportParamsMap
.
put
(
"useInnerCode"
,
userInfoList
.
stream
()
.
map
(
IdxBizJgUseInfo:
:
getUseInnerCode
)
.
filter
(
Objects:
:
nonNull
)
.
distinct
()
.
collect
(
Collectors
.
joining
(
", "
)));
}
List
<
IdxBizJgFactoryInfo
>
factoryInfoList
=
idxBizJgFactoryInfoMapper
.
selectList
(
new
QueryWrapper
<
IdxBizJgFactoryInfo
>().
in
(
"RECORD"
,
vehicleInformationEqList
.
stream
()
...
...
@@ -921,6 +934,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
exportParamsMap
.
put
(
"factoryNum"
,
factoryInfoList
.
stream
()
.
map
(
IdxBizJgFactoryInfo:
:
getFactoryNum
)
.
filter
(
Objects:
:
nonNull
)
.
distinct
()
.
collect
(
Collectors
.
joining
(
", "
)));
}
exportParamsMap
.
put
(
"applyNo"
,
vehicleInformation
.
getApplyNo
());
...
...
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