From b2358fc44148073645def4e723c8153a98a701da Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 24 三月 2026 09:29:32 +0800
Subject: [PATCH] 导入测试
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportRoomFeeSMOImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportRoomFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
index 73ff019..a6874cc 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
@@ -11,15 +11,15 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.payFeeBatch.PayFeeBatchDto;
+import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.user.UserDto;
-import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
-import com.java110.entity.assetImport.ImportRoomFee;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.importData.ImportRoomFee;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
-import com.java110.po.payFeeBatch.PayFeeBatchPo;
+import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
import org.apache.poi.ss.usermodel.Sheet;
@@ -108,7 +108,7 @@
public ResponseEntity<String> importFile(MultipartFile uploadFile) throws Exception {
try {
String fileName = "";
- String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
+ String ossSwitch = MappingCache.getValue(MappingConstant.FILE_DOMAIN, OSSUtil.OSS_SWITCH);
if (StringUtil.isEmpty(ossSwitch) || !OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
@@ -209,8 +209,7 @@
tmpImportRoomFees = new ArrayList<>();
}
}
- if (tmpImportRoomFees != null && tmpImportRoomFees.size() > 0) {
-
+ if (!ListUtil.isNull(tmpImportRoomFees)) {
createRoomFee(pd, tmpImportRoomFees, data, paramOut);
}
return ResultVo.createResponseEntity(ResultVo.CODE_OK, "鎴愬姛锛�" + paramOut.getString("successCount") + ",澶辫触锛�" + paramOut.getString("errorCount"));
--
Gitblit v1.8.0