From 0763faf565ee071fa2083dfdb2777e66720d77cf Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期四, 24 七月 2025 18:29:22 +0800
Subject: [PATCH] 完善导入白单流水功能2025/07/24
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
index 19651c6..55af5ec 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
@@ -59,7 +59,12 @@
Assert.hasValue(os[0], (osIndex + 1) + "琛屾敹璐规棩鏈熶笉鑳戒负绌�");
white = new PropertyWhiteListFlowDto();
- white.setChargeTime(os[0].toString());
+ String chargeTime = excelDoubleToDate(os[0].toString());
+ String changeStart = os[21] == null ? null : excelDoubleToDate(os[21].toString());
+ String changeEnd = os[22] == null ? null : excelDoubleToDate(os[22].toString());
+ String bankDepositDate = os[8] == null ? null : excelDoubleToDate(os[8].toString());
+ String inputTime = os[16] == null ? null : excelDoubleToDate(os[16].toString());
+ white.setChargeTime(chargeTime);
white.setInvoiceReceiptNo(os[1] == null ? null : os[1].toString());
white.setRoomId(os[2] == null ? null : os[2].toString());
white.setPropertyAddress(os[3] == null ? null : os[3].toString());
@@ -67,16 +72,21 @@
white.setSecondaryFeeTypeCd(os[5] == null ? null : os[5].toString());
white.setChargeAmount(os[6] == null ? null : os[6].toString());
white.setCharger(os[7] == null ? null : os[7].toString());
- white.setBankDepositDate(os[8] == null ? null : os[8].toString());
- white.setSheetCount(os[9] == null ? null : os[9].toString());
- white.setFinancialReceiver(os[10] == null ? null : os[10].toString());
- white.setInputTime(os[11] == null ? null : os[11].toString());
- white.setInputPerson(os[12] == null ? null : os[12].toString());
- white.setOrderNo(os[13] == null ? null : os[13].toString());
- white.setLicensePlate(os[14] == null ? null : os[14].toString());
- white.setCategory22(os[15] == null ? null : os[15].toString());
- white.setChargeStart(os[16] == null ? null : os[16].toString());
- white.setChargeEnd(os[17] == null ? null : os[17].toString());
+ white.setBankDepositDate(bankDepositDate);
+ white.setBankDepositor(os[9] == null ? null : os[9].toString());
+ white.setSplitBankDepositAmount(os[10] == null ? null : os[10].toString());
+ white.setBankDepositAmount(os[11] == null ? null : os[11].toString());
+ white.setCheckAmount(os[12] == null ? null : os[12].toString());
+ white.setWhiteListArchiveNo(os[13] == null ? null : os[13].toString());
+ white.setSheetCount(os[14] == null ? null : os[14].toString());
+ white.setFinancialReceiver(os[15] == null ? null : os[15].toString());
+ white.setInputTime(inputTime);
+ white.setInputPerson(os[17] == null ? null : os[17].toString());
+ white.setOrderNo(os[18] == null ? null : os[18].toString());
+ white.setLicensePlate(os[19] == null ? null : os[19].toString());
+ white.setCategory22(os[20] == null ? null : os[20].toString());
+ white.setChargeStart(changeStart);
+ white.setChargeEnd(changeEnd);
whiteLists.add(white);
}
}
--
Gitblit v1.8.0