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
60d9bea7
Commit
60d9bea7
authored
Jan 21, 2025
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):导入管道历史设备状态修改
parent
2dbd6189
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
9 deletions
+6
-9
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+6
-9
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/JgUseRegistrationServiceImpl.java
View file @
60d9bea7
...
...
@@ -2459,15 +2459,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
// 填充投用年月
String
useDateValue
=
(
String
)
jsonObject
.
get
(
"useDate"
);
if
(
CollectionUtils
.
isNotEmpty
(
equipmentLists
)){
for
(
int
i
=
0
;
i
<
equipmentLists
.
size
();
i
++)
{
JSONObject
equipmentItem
=
equipmentLists
.
getJSONObject
(
i
);
equipmentItem
.
put
(
"useDate"
,
timeToMonths
(
useDateValue
));
// 过滤出目前在用的设备
if
(!
this
.
checkEquStatusInUse
(
equipmentItem
.
getString
(
"record"
))){
equipmentLists
.
remove
(
i
);
}
}
if
(
CollectionUtils
.
isNotEmpty
(
equipmentLists
))
{
equipmentLists
=
equipmentLists
.
stream
()
.
map
(
obj
->
(
JSONObject
)
obj
)
.
peek
(
equipmentItem
->
equipmentItem
.
put
(
"useDate"
,
timeToMonths
(
useDateValue
)))
.
filter
(
equipmentItem
->
this
.
checkEquStatusInUse
(
equipmentItem
.
getString
(
"record"
)))
.
collect
(
Collectors
.
toCollection
(
JSONArray:
:
new
));
allEquipment
.
addAll
(
equipmentLists
);
}
});
...
...
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