fix(jg):历史有证设备暂存添加使用登记编号校验

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -815,8 +815,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         String record = (String) equipmentInfoForm.get(RECORD);
         String dataSource = (String) equipmentInfoForm.get(DATA_SOURCE);
 
-        if (dataSource.contains("his") && equipmentInfoForm.get("useRegistrationCode") != null) {
-            String useRegistrationCode = String.valueOf(equipmentInfoForm.get("useRegistrationCode")).trim();
+        if (dataSource.contains("his")) {
+            String useRegistrationCode = Optional.ofNullable(equipmentInfoForm.get("useRegistrationCode"))
+                    .map(String::valueOf)
+                    .map(String::trim)
+                    .orElse(null);
+            if (dataSource.equals("jg_his") && useRegistrationCode == null || Objects.requireNonNull(useRegistrationCode).isEmpty()) {
+                throw new BadRequest("请填写使用登记证编号后进行暂存！");
+            }
             String equipId = String.valueOf(equipmentInfoForm.get("RECORD"));
             // 校验使用登记证编号的唯一性
             if (!CylinderTypeEnum.CYLINDER.getCode().equals(equipmentInfoForm.get("EQU_CATEGORY")) && commonService.useRegistrationCertificateAccountUnique(useRegistrationCode, equipId)) {
@@ -3797,7 +3803,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
         Page<JSONObject> result = jgUseRegistrationMapper.queryForEquipUsedByVehiclePageHistory(page, jsonObject);
         result.getRecords().forEach(i -> {
-            i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
+            i.put("chargingMedium", Optional.ofNullable(fillingMediumMap.get(i.get("chargingMedium"))).orElse(""));
             i.put("productPhoto", JSONArray.parseArray(i.getString("productPhoto")));
             i.put("cylinderStampAttachment", JSONArray.parseArray(i.getString("cylinderStampAttachment")));
             i.put("informationSituation",InformationManageTypeEnum.getName(i.getString("informationSituation")));