From 51f77719ae2db1d56a0670b93e6d9fca558ec86a Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期二, 29 七月 2025 18:37:15 +0800
Subject: [PATCH] 白单流水唯一校验+添加操作人2025/07/29
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 55af5ec..70b5e19 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
@@ -63,7 +63,10 @@
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());
+ String inputTime = null;
+ if(os[16] != null){
+ inputTime = excelDoubleToDate(os[16].toString().split("\\.")[0]);
+ }
white.setChargeTime(chargeTime);
white.setInvoiceReceiptNo(os[1] == null ? null : os[1].toString());
white.setRoomId(os[2] == null ? null : os[2].toString());
@@ -87,6 +90,7 @@
white.setCategory22(os[20] == null ? null : os[20].toString());
white.setChargeStart(changeStart);
white.setChargeEnd(changeEnd);
+ white.setRow(osIndex + 1);
whiteLists.add(white);
}
}
--
Gitblit v1.8.0