open

java110

2023-04-14 a3c0ec1e03635bd47e87b99f4e07337ecae0c457

 springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java

@@ -151,16 +151,16 @@
            tmpImportCustomCreateFeeDtos.add(importCustomCreateFeeDtos.get(roomIndex));
            if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
                // 处理房屋费用
                doImportRoomCreateFee(importCustomCreateFeeDtos, batchId, result);
                doImportCarCreateFee(importCustomCreateFeeDtos, batchId, result);
                doImportRoomCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);
                doImportCarCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);

                tmpImportCustomCreateFeeDtos = new ArrayList<>();
            }
        }
        if (tmpImportCustomCreateFeeDtos != null && tmpImportCustomCreateFeeDtos.size() > 0) {

            doImportRoomCreateFee(importCustomCreateFeeDtos, batchId, result);
            doImportCarCreateFee(importCustomCreateFeeDtos, batchId, result);
            doImportRoomCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);
            doImportCarCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);

        }

@@ -237,7 +237,13 @@
        ownerDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
        List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
        for (ImportCustomCreateFeeDto importRoomFee : importCustomCreateFeeDtos) {
            if(StringUtil.isEmpty(importRoomFee.getPayObjId())){
                continue;
            }
            for (OwnerDto tmpOwnerDto : ownerDtos) {
                if(StringUtil.isEmpty(tmpOwnerDto.getRoomId())){
                    continue;
                }
                if (importRoomFee.getPayObjId().equals(tmpOwnerDto.getRoomId())) {
                    importRoomFee.setOwnerId(tmpOwnerDto.getOwnerId());
                    importRoomFee.setOwnerName(tmpOwnerDto.getName());