bug:27524 【现场需求】监管业务-登记管理-使用登记，气瓶特种设备使用登记表气瓶公称压力取最大值

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipBasicInfoDto.java

@@ -33,4 +33,9 @@ public class EquipBasicInfoDto {
      */
     private String useInnerCode;
 
+    /**
+     * 气瓶公称工作压力
+     */
+    private Double workPressure;
+
 }

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

@@ -2360,8 +2360,9 @@ public class CommonServiceImpl implements ICommonService {
                 formData.put("gasNum",equips.size());
                 //设备品种
                 formData.put("equDefineName",equips.get(0).get("equDefineName"));
-                //气瓶压力及容积求和
-                formData.put("workPressure", equips.stream().mapToDouble(e -> Optional.ofNullable(e.get("nominalWorkingPressure")).map(v -> Double.valueOf(v.toString())).orElse(0.0)).sum());
+                // 气瓶压力及容积求和  BUG 27524 【现场需求】监管业务-登记管理-使用登记，气瓶特种设备使用登记表气瓶公称压力取最大值
+                // 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());
                 formData.put("volume", equips.stream().mapToDouble(e -> Optional.ofNullable(e.get("singleBottleVolume")).map(v -> Double.valueOf(v.toString())).orElse(0.0)).sum());
                 Set<String> chargingMedium = equips.stream().map(e -> String.valueOf(e.get("chargingMedium"))).collect(Collectors.toSet());
                 if (chargingMedium.size()>1){

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

@@ -1265,8 +1265,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                     String produceDate = Objects.toString(map.get("produceDate"), "");
                     double nominalWorkingPressure = map.get("nominalWorkingPressure") != null ?
                             Double.parseDouble(map.get("nominalWorkingPressure").toString()) : 0.0;
-                    exportParamsMap.merge("workPressure", nominalWorkingPressure, (oldVal, newVal) -> (double) oldVal + (double) newVal);
-                    return new EquipBasicInfoDto(produceUnitName, produceDate, factoryNum, useInnerCode);
+                    return new EquipBasicInfoDto(produceUnitName, produceDate, factoryNum, useInnerCode, nominalWorkingPressure);
                 })
                 .collect(Collectors.toList());
 
@@ -1274,6 +1273,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         exportParamsMap.put("registrationType", "新设备首次启用");
         exportParamsMap.put("equDefineName", CylinderTypeEnum.of(equDefine));
         exportParamsMap.put("equipDefine", "车用气瓶");
+        exportParamsMap.put("workPressure", equipBasicInfoList.stream().mapToDouble(EquipBasicInfoDto::getWorkPressure).max());
         exportParamsMap.put("gasNum", vehicleInformation.getGasNum());
         exportParamsMap.put("chargingMedium", vehicleInformation.getFillingMedium());
         exportParamsMap.put("volume", vehicleInformation.getVolume());