Merge remote-tracking branch 'origin/develop_tzs_register_test' into develop_tzs_register_test

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

@@ -2362,7 +2362,7 @@ public class CommonServiceImpl implements ICommonService {
                 formData.put("equDefineName",equips.get(0).get("equDefineName"));
                 // 气瓶压力及容积求和  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("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());
                 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/JgReformNoticeServiceImpl.java

@@ -1132,11 +1132,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
             // 施工信息
             IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(toJSONString(pipData), IdxBizJgConstructionInfo.class);
-            CompanyBo company = this.getSelectedOrgInfo().getCompany();
             constructionInfo.setRecord(record);
             constructionInfo.setRecDate(date);
-            constructionInfo.setUscUnitCreditCode(company.getCompanyCode());
-            constructionInfo.setUscUnitName(company.getCompanyName());
             constructionInfo.setSequenceNbr(null);
             constructionInfoList.add(constructionInfo);
 
@@ -1172,11 +1169,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
             // 检验检测
             IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(toJSONString(pipData), IdxBizJgInspectionDetectionInfo.class);
-            inspectionDetectionInfo.setRecord(record);
-            inspectionDetectionInfo.setRecDate(date);
-            Optional.ofNullable(inspectionDetectionInfo.getNextInspectDate()).ifPresent(x -> inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(DateUtil.format(inspectionDetectionInfo.getNextInspectDate(), DatePattern.NORM_DATE_PATTERN))));
-            inspectionDetectionInfo.setSequenceNbr(null);
-            idxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+            if (!BeanUtil.isEmpty(inspectionDetectionInfo)) {
+                inspectionDetectionInfo.setRecord(record);
+                inspectionDetectionInfo.setRecDate(date);
+                Optional.ofNullable(inspectionDetectionInfo.getNextInspectDate()).ifPresent(x -> inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(DateUtil.format(inspectionDetectionInfo.getNextInspectDate(), DatePattern.NORM_DATE_PATTERN))));
+                inspectionDetectionInfo.setSequenceNbr(null);
+                idxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+            }
 
             // 管道技术参数
             IdxBizJgTechParamsPipeline pipelineInfo = JSON.parseObject(toJSONString(pipData), IdxBizJgTechParamsPipeline.class);

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

@@ -1193,8 +1193,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 更新工程装置信息
             if (Objects.nonNull(jgProjectContraption)) {
                 jgProjectContraption.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
-                jgProjectContraption.setUscUnitCreditCode(null);
-                jgProjectContraption.setUscUnitName(null);
+                jgProjectContraption.setUscUnitCreditCode("");
+                jgProjectContraption.setUscUnitName("");
                 jgProjectContraptionService.updateById(jgProjectContraption);
             }
             // 取第一条设备的注册消息--用来获取这一批设备的设备种类/类别/品种

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

@@ -1273,7 +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("workPressure", equipBasicInfoList.stream().mapToDouble(EquipBasicInfoDto::getWorkPressure).max().getAsDouble());
         exportParamsMap.put("gasNum", vehicleInformation.getGasNum());
         exportParamsMap.put("chargingMedium", vehicleInformation.getFillingMedium());
         exportParamsMap.put("volume", vehicleInformation.getVolume());