From 3311847f3252555fb56b4f4f20c8af440e2484e2 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 三月 2022 17:38:16 +0800
Subject: [PATCH] 资产导入功能开发完成
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
index 7a78124..22f6f11 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
@@ -12,6 +12,7 @@
import com.java110.utils.util.CommonUtil;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
@@ -248,6 +249,8 @@
List<ImportOwnerRoomDto> tmpImportOwnerRoomDtos = new ArrayList<>();
int flag = 0;
+
+ int successCount = 0;
try {
for (int roomIndex = 0; roomIndex < ownerRoomDtos.size(); roomIndex++) {
tmpImportOwnerRoomDtos.add(ownerRoomDtos.get(roomIndex));
@@ -257,6 +260,8 @@
throw new IllegalArgumentException("淇濆瓨澶辫触");
}
tmpImportOwnerRoomDtos = new ArrayList<>();
+
+ successCount += flag;
}
}
@@ -265,6 +270,7 @@
if (flag < 1) {
throw new IllegalArgumentException("淇濆瓨澶辫触");
}
+ successCount += flag;
}
} catch (Exception e) {
logger.error("瀵煎叆澶辫触", e);
@@ -272,7 +278,7 @@
throw e;
}
- return responseEntity;
+ return ResultVo.createResponseEntity("鎬诲叡瀵煎叆:" + ownerRoomDtos.size() + ";鎴愬姛瀵煎叆锛�" + successCount + ";瀵煎叆澶辫触锛�" + (ownerRoomDtos.size() - successCount));
}
//瑙ｆ瀽Excel鏃ユ湡鏍煎紡
--
Gitblit v1.8.0