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
8dd35400
Commit
8dd35400
authored
Aug 01, 2025
by
hcing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):生产bugfix 30344
parent
415bc1ca
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
CommonServiceImpl.java
...os/boot/module/jg/biz/service/impl/CommonServiceImpl.java
+7
-5
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/CommonServiceImpl.java
View file @
8dd35400
...
...
@@ -2506,12 +2506,14 @@ public class CommonServiceImpl implements ICommonService {
// equips.stream().mapToDouble(e -> Optional.ofNullable(e.get("nominalWorkingPressure")).map(v -> Double.valueOf(v.toString())).orElse(0.0)).sum()
formData
.
put
(
"workPressure"
,
equips
.
stream
().
mapToDouble
(
e
->
Optional
.
ofNullable
(
e
.
get
(
"nominalWorkingPressure"
)).
map
(
v
->
Double
.
valueOf
(
v
.
toString
())).
orElse
(
0.0
)).
max
().
getAsDouble
());
formData
.
put
(
"volume"
,
equips
.
stream
().
mapToDouble
(
e
->
Optional
.
ofNullable
(
e
.
get
(
"singleBottleVolume"
)).
map
(
v
->
Double
.
valueOf
(
v
.
toString
())).
orElse
(
0.0
)).
sum
());
// BUG 30344 【生产问题】车用气瓶使用登记时,同一车辆可以选择两个充装介质不同的气瓶发起使用登记
Set
<
String
>
chargingMedium
=
equips
.
stream
().
map
(
e
->
String
.
valueOf
(
e
.
get
(
"chargingMedium"
))).
collect
(
Collectors
.
toSet
());
if
(
chargingMedium
.
size
()
>
1
)
{
throw
new
BadRequest
(
"充装介质仅可选择同一类型"
);
}
else
{
formData
.
put
(
"chargingMedium"
,
equips
.
get
(
0
).
get
(
"chargingMedium"
));
}
formData
.
put
(
"chargingMedium"
,
String
.
join
(
","
,
chargingMedium
));
// if (chargingMedium.size() > 1) {
// throw new BadRequest("充装介质仅可选择同一类型");
// } else {
// formData.put("chargingMedium", equips.get(0).get("chargingMedium"));
// }
}
}
...
...
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