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

@@ -3077,27 +3077,28 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 List<IdxBizJgUseInfo> useInfoListByEquIds = idxBizJgUseInfoService.getUseInfoListByEquIds(equIds);
                 Map<String, String> equAddressMap = new HashMap<>();
                 if (!ValidationUtil.isEmpty(useInfoListByEquIds)) {
-                    equAddressMap = useInfoListByEquIds.stream().collect(Collectors.toMap(IdxBizJgUseInfo::getRecord,
-                                    useInfo -> {
-                                        String fulladdress = "";
-                                        if (!ValidationUtil.isEmpty(useInfo.getProvinceName())) {
-                                            fulladdress += useInfo.getProvinceName();
-                                        }
-                                        if (!ValidationUtil.isEmpty(useInfo.getCityName())) {
-                                            fulladdress += useInfo.getCityName();
-                                        }
-                                        if (!ValidationUtil.isEmpty(useInfo.getCountyName())) {
-                                            fulladdress += useInfo.getCountyName();
-                                        }
-                                        if (!ValidationUtil.isEmpty(useInfo.getStreetName())) {
-                                            fulladdress += useInfo.getStreetName();
-                                        }
-                                        if (!ValidationUtil.isEmpty(useInfo.getAddress())) {
-                                            fulladdress += useInfo.getAddress();
-                                        }
-                                        return fulladdress;
-                                    }
-                            )
+                    equAddressMap = useInfoListByEquIds.stream().collect(Collectors.toMap(
+                            IdxBizJgUseInfo::getRecord,
+                            useInfo -> {
+                                String fulladdress = "";
+                                if (!ValidationUtil.isEmpty(useInfo.getProvinceName())) {
+                                    fulladdress += useInfo.getProvinceName();
+                                }
+                                if (!ValidationUtil.isEmpty(useInfo.getCityName())) {
+                                    fulladdress += useInfo.getCityName();
+                                }
+                                if (!ValidationUtil.isEmpty(useInfo.getCountyName())) {
+                                    fulladdress += useInfo.getCountyName();
+                                }
+                                if (!ValidationUtil.isEmpty(useInfo.getStreetName())) {
+                                    fulladdress += useInfo.getStreetName();
+                                }
+                                if (!ValidationUtil.isEmpty(useInfo.getAddress())) {
+                                    fulladdress += useInfo.getAddress();
+                                }
+                                return fulladdress;
+                            },
+                            (v1, v2) -> v1)
                     );
                 }
 
@@ -4099,7 +4100,8 @@ 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", Optional.ofNullable(fillingMediumMap.get(i.get("chargingMedium"))).orElse(""));
+                i.put("chargingMedium", MapUtil.getStr(fillingMediumMap, "chargingMedium", ""));
+                i.put("sequenceNbr", MapUtil.getStr(i, "record"));
                 i.put("productPhoto", JSONArray.parseArray(i.getString("productPhoto")));
                 i.put("cylinderStampAttachment", JSONArray.parseArray(i.getString("cylinderStampAttachment")));
                 i.put("informationSituation",InformationManageTypeEnum.getName(i.getString("informationSituation")));

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

@@ -16,10 +16,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
-import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.*;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeVehicleRegistrationUnitMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeVehicleRegistrationUnitService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -824,6 +821,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         map.put("useRegistrationCode", useRegistrationCode);
         JgUseRegistrationManage registrationManage = jgUseRegistrationManageService.lambdaQuery()
                 .eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
+                .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName())
                 .eq(JgUseRegistrationManage::getIsDelete,0)
                 .one();
         List<JSONObject> jsonObjects = jgUseRegistrationManageService.queryEquByCertificateSeq(registrationManage.getSequenceNbr());