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

@@ -1915,6 +1915,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
             objMap.put("EQU_DEFINE_DEAL",equDefineStr);
         }
+        // objMap中值为"null"的替换为null
+        objMap.entrySet().removeIf(e -> "null".equals(e.getValue()));
         return objMap;
     }
 
@@ -4137,7 +4139,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
             Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject, recordList);
             result.getRecords().forEach(i -> {
-                i.put("chargingMedium", MapUtil.getStr(fillingMediumMap, "chargingMedium", ""));
+                i.put("chargingMedium", MapUtil.getStr(fillingMediumMap, MapUtil.getStr(i, "chargingMedium"), ""));
                 i.put("sequenceNbr", MapUtil.getStr(i, "record"));
                 i.put("productPhoto", JSONArray.parseArray(i.getString("productPhoto")));
                 i.put("cylinderStampAttachment", JSONArray.parseArray(i.getString("cylinderStampAttachment")));

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

@@ -470,10 +470,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         idxBizJgRegisterInfoService.update(IdxBizJgRegLambda);
 
         // 更新制造信息-产品编号
-        LambdaUpdateWrapper<IdxBizJgFactoryInfo> factoryLambda = new UpdateWrapper<IdxBizJgFactoryInfo>().lambda();
-        factoryLambda.eq(IdxBizJgFactoryInfo::getRecord, map.get("equipId"))
-                .set(IdxBizJgFactoryInfo::getFactoryNum, map.get("factoryNum"));
-        idxBizJgFactoryInfoService.update(factoryLambda);
+        // 单位办理的不修改产品编号，页面没有修改入口
+        String equipList = MapUtil.getStr(map, "equipmentLists");
+        if (ValidationUtil.isEmpty(equipList)) {
+            LambdaUpdateWrapper<IdxBizJgFactoryInfo> factoryLambda = new UpdateWrapper<IdxBizJgFactoryInfo>().lambda();
+            factoryLambda.eq(IdxBizJgFactoryInfo::getRecord, map.get("equipId"))
+                    .set(IdxBizJgFactoryInfo::getFactoryNum, map.get("factoryNum"));
+            idxBizJgFactoryInfoService.update(factoryLambda);
+        }
 
         // 更新设备监管部门
         IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = new IdxBizJgSupervisionInfo();
@@ -2522,7 +2526,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                                 ? Collections.emptyList()
                                 : jgUseRegistrationMapper.queryForUnitVesselEquipment(records);
                         result.forEach(i -> {
-                            i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
+                            i.put("chargingMedium", MapUtil.getStr(fillingMediumMap, i.get("chargingMedium"), ""));
                             i.put("productPhoto", JSONArray.parseArray((String) i.get("productPhoto")));
                             i.put("cylinderStampAttachment", JSONArray.parseArray((String) i.get("cylinderStampAttachment")));
                             i.put("informationSituation", InformationManageTypeEnum.getName((String) i.get("informationSituation")));