Commit 8dd35400 authored by hcing's avatar hcing

fix(jg):生产bugfix 30344

parent 415bc1ca
...@@ -2506,12 +2506,14 @@ public class CommonServiceImpl implements ICommonService { ...@@ -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() // 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("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()); 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()); Set<String> chargingMedium = equips.stream().map(e -> String.valueOf(e.get("chargingMedium"))).collect(Collectors.toSet());
if (chargingMedium.size() > 1) { formData.put("chargingMedium", String.join(",", chargingMedium));
throw new BadRequest("充装介质仅可选择同一类型"); // if (chargingMedium.size() > 1) {
} else { // throw new BadRequest("充装介质仅可选择同一类型");
formData.put("chargingMedium", equips.get(0).get("chargingMedium")); // } else {
} // formData.put("chargingMedium", equips.get(0).get("chargingMedium"));
// }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment