From cd3107ad63c0bf8d17d71962385c05c7f4a68419 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期四, 31 七月 2025 18:42:12 +0800
Subject: [PATCH] 停车道闸系统与物业管理系统接口设计的入口车辆识别接口2025/07/31
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 5df11b1..3e95a0d 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
@@ -74,13 +74,13 @@
private void getRoomsAndCars(Workbook workbook, List<ImportRoomFee> importRoomFees) {
Sheet sheet = null;
- sheet = ImportExcelUtils.getSheet(workbook, "鎴垮眿璐圭敤淇℃伅");
+ sheet = ImportExcelUtils.getSheet(workbook, "璐圭敤瀵煎叆妯℃澘");
List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
ImportRoomFee importRoomFee = null;
Map<Integer, Object> debugs = new HashMap<Integer, Object>();
for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
Object[] os = oList.get(osIndex);
- if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
+ if (osIndex == 0 || osIndex == 1) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
continue;
}
if (os == null ||(os[0] == null && os[1] == null && os[2] == null)) {
@@ -93,10 +93,11 @@
importRoomFee = new ImportRoomFee();
- importRoomFee.setPayerObjName(os[0]==null?os[1].toString():os[0].toString());
- importRoomFee.setObjType(os[0] == null ? "6666" : "3333");
+ importRoomFee.setPayerObjName(os[0] == null || (os[0] != null && os[1] != null)?os[1].toString():os[0].toString());
+ importRoomFee.setObjType(os[0] == null || (os[0] != null && os[1] != null) ? "6666" : "3333");
importRoomFee.setFeeTypeCd(os[2] == null ? null : os[2].toString());
importRoomFee.setFeeName(os[3] == null ? null : os[3].toString());
+ importRoomFee.setExpenseSubject(os[0] == null || (os[0] != null && os[1] != null)?os[1].toString():os[0].toString());
if(startTime != null){
importRoomFee.setStartTime(startTime);
}
@@ -104,8 +105,8 @@
importRoomFee.setEndTime(endTime);
}
if (os.length > 6){
- importRoomFee.setCreateTime(os[6] == null ? null : os[6].toString());
- importRoomFee.setAmount(os[7] == null ? null : os[7].toString());
+ importRoomFee.setCreateTime(os[7] == null ? null : excelDoubleToDate(os[7].toString()));
+ importRoomFee.setAmount(os[6] == null ? null : os[6].toString());
}else{
importRoomFee.setCreateTime(null);
importRoomFee.setAmount("0");
--
Gitblit v1.8.0