From 17cc5a434d6acc39eeddfd913f0f0d39edd20e9e Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期四, 14 八月 2025 19:38:25 +0800
Subject: [PATCH] 合同费用导入2025/08/14
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 3e95a0d..0de6bb7 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
@@ -83,11 +83,14 @@
if (osIndex == 0 || osIndex == 1) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
continue;
}
- if (os == null ||(os[0] == null && os[1] == null && os[2] == null)) {
+ if((os[0] == null && os[2] == null && os[1] == null)){
break;
}
- String startTime = handleExcelDateString(os[4].toString());
- String endTime = handleExcelDateString(os[5].toString());
+ if (os == null ||(os[0] == null && os[1] == null)|| (os[0] == null && os[2] == null)) {
+ throw new IllegalArgumentException("璇烽�夋嫨璐圭敤涓讳綋+杞︾墝鍙锋垨璐圭敤涓讳綋+鍚堝悓缂栧彿");
+ }
+ String startTime = handleExcelDateString(os[5].toString());
+ String endTime = handleExcelDateString(os[6].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 鏂囨湰鏍煎紡");
@@ -95,8 +98,11 @@
importRoomFee = new ImportRoomFee();
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.setIsContractFee(os[0] != null && os[1] ==null && os[2] != null ? "O" : null);
+ importRoomFee.setObjType(os[0] != null && os[1] ==null && os[2] != null ? "7777" : null);
+ importRoomFee.setContractId(os[0] != null && os[1] ==null && os[2] != null ? os[2].toString() : null);
+ importRoomFee.setFeeTypeCd(os[3] == null ? null : os[3].toString());
+ importRoomFee.setFeeName(os[4] == null ? null : os[4].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,9 +110,9 @@
if(endTime != null){
importRoomFee.setEndTime(endTime);
}
- if (os.length > 6){
- importRoomFee.setCreateTime(os[7] == null ? null : excelDoubleToDate(os[7].toString()));
- importRoomFee.setAmount(os[6] == null ? null : os[6].toString());
+ if (os.length > 7){
+ importRoomFee.setCreateTime(os[8] == null ? null : excelDoubleToDate(os[8].toString()));
+ importRoomFee.setAmount(os[7] == null ? null : os[7].toString());
}else{
importRoomFee.setCreateTime(null);
importRoomFee.setAmount("0");
--
Gitblit v1.8.0