chengf
2026-03-12 4c3fa7b1828d5e9bbd586a42fa00924e9f5a7c25
service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java
@@ -153,25 +153,27 @@
        importOwnerRoomDto.setPersonRole(OwnerDto.PERSON_ROLE_OWNER);
        importOwnerRoomDto.setMonthlyUnitPrice(objects.getString(23));
        importOwnerRoomDto.setPropertyFeeMonth(objects.getString(24));
        //--------设置物业类型
        DictDto dictDto = new DictDto();
        dictDto.setTableName("building_room");
        dictDto.setTableColumns("room_sub_type");
        dictDto.setName(Vtil.defaultValue(objects.get(1)));
        List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDictAndSpecs(dictDto);
        if (dictDtos.isEmpty()) {
            DictPo dictPo = new DictPo();
            dictPo.setStatusCd(GenerateCodeFactory.getGeneratorId("2"));
            dictPo.setTableName("building_room");
            dictPo.setTableColumns("room_sub_type");
            dictPo.setName(Vtil.defaultValue(objects.get(1)));
            dictV1InnerServiceSMOImpl.saveDict(dictPo);
            dictDtos = dictV1InnerServiceSMOImpl.queryDictAndSpecs(dictDto);
        if (!Vtil.defaultValue(objects.get(1)).isEmpty()) {
            //--------设置物业类型
            DictDto dictDto = new DictDto();
            dictDto.setTableName("building_room");
            dictDto.setTableColumns("room_sub_type");
            dictDto.setName(Vtil.defaultValue(objects.get(1)));
            List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDictAndSpecs(dictDto);
            if (dictDtos.isEmpty()) {
                throw new IllegalArgumentException("导入失败:字典中不存在物业类型:" + Vtil.defaultValue(objects.get(1)));
                DictPo dictPo = new DictPo();
                dictPo.setStatusCd(GenerateCodeFactory.getGeneratorId("2"));
                dictPo.setTableName("building_room");
                dictPo.setTableColumns("room_sub_type");
                dictPo.setName(Vtil.defaultValue(objects.get(1)));
                dictV1InnerServiceSMOImpl.saveDict(dictPo);
                dictDtos = dictV1InnerServiceSMOImpl.queryDictAndSpecs(dictDto);
                if (dictDtos.isEmpty()) {
                    throw new IllegalArgumentException("导入失败:字典中不存在物业类型:" + Vtil.defaultValue(objects.get(1)));
                }
            }
            importOwnerRoomDto.setRoomSubType(dictDtos.get(0).getStatusCd());
        }
        importOwnerRoomDto.setRoomSubType(dictDtos.get(0).getStatusCd());
        //----------
        importOwnerRoomDto.setPropertyType(Vtil.defaultValue(objects.get(2)));//住宅类型