From 02f80cc8cc9bc56e56ce2192bbd3f274778291de Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 28 九月 2023 04:48:16 +0800
Subject: [PATCH] 交费历史导入
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java
index 384eb22..3baf0d4 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java
@@ -112,36 +112,38 @@
if (StringUtil.isNullOrNone(os[4])) {
continue;
}
- Assert.hasValue(os[0], (osIndex + 1) + "琛屾ゼ鏍嬬紪鍙蜂笉鑳戒负绌�");
- Assert.hasValue(os[1], (osIndex + 1) + "琛屽崟鍏冪紪鍙蜂笉鑳戒负绌�");
- Assert.hasValue(os[2], (osIndex + 1) + "琛屾埧灞嬬紪鍙蜂笉鑳戒负绌�");
- Assert.hasValue(os[3], (osIndex + 1) + "琛屾敹璐归」鐩笉鑳戒负绌�");
- Assert.hasValue(os[4], (osIndex + 1) + "琛岀即璐瑰懆鏈熶笉鑳戒负绌�");
- Assert.hasValue(os[5], (osIndex + 1) + "琛屽紑濮嬫椂闂翠笉鑳戒负绌�");
- Assert.hasValue(os[6], (osIndex + 1) + "琛岀粨鏉熸椂闂翠笉鑳戒负绌�");
- Assert.hasValue(os[7], (osIndex + 1) + "琛岀即璐规椂闂翠笉鑳戒负绌�");
- Assert.hasValue(os[8], (osIndex + 1) + "琛岀即璐归噾棰濅笉鑳戒负绌�");
+ Assert.hasValue(os[0], (osIndex + 1) + "琛屾埧灞嬬紪鍙蜂笉鑳戒负绌�");
+ Assert.hasValue(os[1], (osIndex + 1) + "琛屾敹璐归」鐩笉鑳戒负绌�");
+ Assert.hasValue(os[2], (osIndex + 1) + "琛岀即璐瑰懆鏈熶笉鑳戒负绌�");
+ Assert.hasValue(os[3], (osIndex + 1) + "琛屽紑濮嬫椂闂翠笉鑳戒负绌�");
+ Assert.hasValue(os[4], (osIndex + 1) + "琛岀粨鏉熸椂闂翠笉鑳戒负绌�");
+ Assert.hasValue(os[5], (osIndex + 1) + "琛岀即璐规椂闂翠笉鑳戒负绌�");
+ Assert.hasValue(os[6], (osIndex + 1) + "琛屽簲缂撮噾棰濅笉鑳戒负绌�");
+ Assert.hasValue(os[7], (osIndex + 1) + "琛屽疄缂撮噾棰濅笉鑳戒负绌�");
+ Assert.hasValue(os[8], (osIndex + 1) + "琛屾敹閾跺憳涓嶈兘涓虹┖");
//
- String startTime = excelDoubleToDate(os[5].toString());
- String endTime = excelDoubleToDate(os[6].toString());
- String createTime = excelDoubleToDate(os[7].toString());
+ String startTime = excelDoubleToDate(os[3].toString());
+ String endTime = excelDoubleToDate(os[4].toString());
+ String createTime = excelDoubleToDate(os[5].toString());
Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
-
+ String[] roomNames = os[0].toString().split("-",3);
importRoomFee = new ImportRoomFee();
- importRoomFee.setFloorNum(os[0].toString());
- importRoomFee.setUnitNum(os[1].toString());
- importRoomFee.setRoomNum(os[2].toString());
- importRoomFee.setFeeName(os[3].toString());
- importRoomFee.setCycle(os[4].toString());
+ importRoomFee.setFloorNum(roomNames[0]);
+ importRoomFee.setUnitNum(roomNames[1]);
+ importRoomFee.setRoomNum(roomNames[2]);
+ importRoomFee.setFeeName(os[1].toString());
+ importRoomFee.setCycle(os[2].toString());
importRoomFee.setStartTime(startTime);
importRoomFee.setEndTime(endTime);
importRoomFee.setCreateTime(createTime);
- importRoomFee.setAmount(os[8].toString());
+ importRoomFee.setReceivableAmount(os[6].toString());
+ importRoomFee.setAmount(os[7].toString());
+ importRoomFee.setStaffName(os[8].toString());
importRoomFee.setRemark(!StringUtil.isNullOrNone(os[9]) ? os[9].toString() : "");
rooms.add(importRoomFee);
}
--
Gitblit v1.8.0