From ee4d1b668d1666cdec803b037ce8181763154bb6 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期五, 25 七月 2025 18:25:07 +0800
Subject: [PATCH] 费用导入逻辑变更2025/07/25
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java
index 82a3c10..5df11b1 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java
@@ -68,7 +68,6 @@
importRoomFee.setStoreId(paramIn.getString("storeId"));
importRoomFee.setCommunityId(paramIn.getString("communityId"));
// importRoomFee.setFeeTypeCd(paramIn.getString("feeTypeCd"));
- importRoomFee.setObjType(paramIn.getString("objType"));
}
return importRoomFees;
}
@@ -84,16 +83,9 @@
if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
continue;
}
- if (os[2] == null) {
- continue;
+ if (os == null ||(os[0] == null && os[1] == null && os[2] == null)) {
+ break;
}
- if ((StringUtil.isNullOrNone(os[0]) && StringUtil.isNullOrNone(os[1])) || (!StringUtil.isNullOrNone(os[0]) && !StringUtil.isNullOrNone(os[1]))) {
- Assert.hasValue(os[2], (osIndex + 1) + "琛岃鍐欏叆璐圭敤涓讳綋鍜岃溅鐗屽彿鍏朵腑涓�鍒�");
- continue;
- }
- Assert.hasValue(os[2], (osIndex + 1) + "琛岃垂鐢ㄧ被鍨嬩笉鑳戒负绌�");
- Assert.hasValue(os[3], (osIndex + 1) + "琛岃垂鐢ㄩ」鐩笉鑳戒负绌�");
-
String startTime = handleExcelDateString(os[4].toString());
String endTime = handleExcelDateString(os[5].toString());
Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY/MM/DD 鏂囨湰鏍煎紡");
@@ -102,17 +94,22 @@
importRoomFee = new ImportRoomFee();
importRoomFee.setPayerObjName(os[0]==null?os[1].toString():os[0].toString());
-// importRoomFee.set
- importRoomFee.setFeeTypeCd(os[2].toString());
-
- importRoomFee.setFeeName(os[3].toString());
+ importRoomFee.setObjType(os[0] == null ? "6666" : "3333");
+ importRoomFee.setFeeTypeCd(os[2] == null ? null : os[2].toString());
+ importRoomFee.setFeeName(os[3] == null ? null : os[3].toString());
if(startTime != null){
importRoomFee.setStartTime(startTime);
}
if(endTime != null){
importRoomFee.setEndTime(endTime);
}
- importRoomFee.setAmount(os[7].toString());
+ if (os.length > 6){
+ importRoomFee.setCreateTime(os[6] == null ? null : os[6].toString());
+ importRoomFee.setAmount(os[7] == null ? null : os[7].toString());
+ }else{
+ importRoomFee.setCreateTime(null);
+ importRoomFee.setAmount("0");
+ }
importRoomFees.add(importRoomFee);
}
}
--
Gitblit v1.8.0