From a3c0ec1e03635bd47e87b99f4e07337ecae0c457 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 14 四月 2023 14:06:28 +0800
Subject: [PATCH] open
---
springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java b/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java
index 0fcd61e..bc92916 100644
--- a/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java
+++ b/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);
}
@@ -213,7 +213,7 @@
if (!ImportCustomCreateFeeDto.TYPE_ROOM.equals(importCustomCreateFeeDto.getObjType())) {
continue;
}
- objNames = importCustomCreateFeeDto.getObjName().split("-");
+ objNames = importCustomCreateFeeDto.getObjName().split("-",3);
if (objNames.length != 3) {
continue;
}
@@ -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());
--
Gitblit v1.8.0