From b88a288f4f787b509463678e3cd9ccfa3f37014b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 11 三月 2026 12:01:05 +0800
Subject: [PATCH] 导入测试
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportContractCleaningAdapt.java | 98 +++++++++++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 39 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportContractCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportContractCleaningAdapt.java
index be9a6dc..fc5eb60 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportContractCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportContractCleaningAdapt.java
@@ -6,6 +6,7 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.contract.*;
import com.java110.dto.importData.ImportOwnerRoomDto;
+import com.java110.dto.importData.Vtil;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
@@ -18,6 +19,7 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -62,21 +64,26 @@
}
Object[] os = oList.get(osIndex);
+ if (os == null) { // 鏂板绌哄�煎垽鏂�
+ os = new Object[142]; // 绌烘暟缁勫垯鐩存帴鍒涘缓闀垮害涓� 142 鐨勬暟缁�
+ } else if (os.length < 142) {
+ os = Arrays.copyOf(os, 142);
+ }
+
ContractDto contractDto = new ContractDto();
contractDto.setContractId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_contractId));
contractDto.setPropertyCompany(defaultValue(os[qbl + 1]));
contractDto.setCommunityName(defaultValue(os[qbl + 2]));
contractDto.setState(defaultValue(os[qbl + 3]));
- contractDto.setStartTime(defaultValue(os[qbl + 4]));
- contractDto.setEndTime(defaultValue(os[qbl + 5]));
- String now = DateUtil.getFormatTimeStringB(new Date());
- contractDto.setSigningTime(defaultValue(os[qbl + 6]).equals("") ? now : defaultValue(os[qbl + 6]));
+ contractDto.setStartTime(Vtil.defaultValueToDate(os[qbl + 4]));
+ contractDto.setEndTime(Vtil.defaultValueToDate(os[qbl + 5]));
+ contractDto.setSigningTime(Vtil.defaultValueToDate(os[qbl + 6]));
contractDto.setContractTerm(defaultValue(os[qbl + 7]));
contractDto.setContractCode(defaultValue(os[qbl + 8]));
contractDto.setIsArchived(defaultValue(os[qbl + 9]));
contractDto.setContractType(defaultValue(os[qbl + 11]));
contractDto.setHasSupplementAgreement(defaultValue(os[qbl + 12]));
- contractDto.setContractReminderDate(defaultValue(os[qbl + 13]));
+ contractDto.setContractReminderDate(Vtil.defaultValueToDate(os[qbl + 13]));
contractDto.setPartyA(defaultValue(os[qbl + 14]));
contractDto.setPartyB(defaultValue(os[qbl + 1]));
contractDto.setSignatoryAddress(defaultValue(os[qbl + 15]));
@@ -101,19 +108,24 @@
private void setCcds(ContractDto contractDto, Object[] os) {
for (int j = 0; j < 10; j++) {
try {
- int index = j * 7 + 58;
+ int index = j * 10 + 53;
if (os[index] == null || os[index].equals("")) {
return;
}
ContractCollectionDetailDto ccd = new ContractCollectionDetailDto();
ccd.setContractId(contractDto.getContractId());
- ccd.setCollectionPeriodStart(defaultValue(os[qbl + index]));
- ccd.setQueryCollectionPeriodEnd(defaultValue(os[qbl + index + 1]));
- ccd.setCollectionAmount(defaultValue(os[qbl + index + 2]));
- ccd.setCollectionDate(defaultValue(os[qbl + index + 3]));
- ccd.setCollectionAmount(defaultValue(os[qbl + index + 4]));
- ccd.setSpecialReduction(defaultValue(os[qbl + index + 5]));
- ccd.setUnpaidMoney(defaultValue(os[qbl + index + 6]));
+
+ ccd.setChargeType(Vtil.defaultValue(os[index]));
+ ccd.setInvoiceReceiptNo(Vtil.defaultValue(os[index+1]));
+ ccd.setWhiteListArchiveNo(Vtil.defaultValue(os[index+2]));
+
+ ccd.setCollectionPeriodStart(Vtil.defaultValueToDate(os[qbl + index + 3]));
+ ccd.setQueryCollectionPeriodEnd(Vtil.defaultValueToDate(os[qbl + index + 4]));
+ ccd.setCollectionAmount(defaultValue(os[qbl + index + 5]));
+ ccd.setCollectionDate(defaultValue(os[qbl + index + 6]));
+ ccd.setCollectionAmount(defaultValue(os[qbl + index + 7]));
+ ccd.setSpecialReduction(defaultValue(os[qbl + index + 8]));
+ ccd.setUnpaidMoney(defaultValue(os[qbl + index + 9]));
contractDto.getContractCollectionDetailDtos().add(ccd);
} catch (Exception e){
continue;
@@ -124,15 +136,15 @@
private void setCps(ContractDto contractDto, Object[] os) {
ContractPaymentStatusDto cps = new ContractPaymentStatusDto();
cps.setContractId(contractDto.getContractId());
- cps.setPaymentStatus(defaultValue(os[qbl + 49]));
- cps.setReceivableAmount(defaultValue(os[qbl + 50]));
- cps.setReceivedAmount(defaultValue(os[qbl + 51]));
- cps.setUnpaidAmount(defaultValue(os[qbl + 52]));
- cps.setSpecialDiscount(defaultValue(os[qbl + 53]));
- cps.setCollectionProgress(defaultValue(os[qbl + 54]));
- cps.setFinalCollectionDeadline(defaultValue(os[qbl + 55]));
- cps.setCollectionReminderStatus(defaultValue(os[qbl + 56]));
- cps.setRemark(defaultValue(os[qbl + 57]));
+ cps.setPaymentStatus(defaultValue(os[qbl + 44]));
+ cps.setReceivableAmount(defaultValue(os[qbl + 45]));
+ cps.setReceivedAmount(defaultValue(os[qbl + 46]));
+ cps.setUnpaidAmount(defaultValue(os[qbl + 47]));
+ cps.setSpecialDiscount(defaultValue(os[qbl + 48]));
+ cps.setCollectionProgress(defaultValue(os[qbl + 49]));
+ cps.setFinalCollectionDeadline(defaultValue(os[qbl + 50]));
+ cps.setCollectionReminderStatus(defaultValue(os[qbl + 51]));
+ cps.setRemark(defaultValue(os[qbl + 52]));
contractDto.setContractPaymentStatus(cps);
}
@@ -140,10 +152,10 @@
private void setCms(ContractDto contractDto, Object[] os) {
ContractManagementShareDto cms = new ContractManagementShareDto();
cms.setContractId(contractDto.getContractId());
- cms.setManagementRatio(defaultValue(os[qbl + 45]));
- cms.setOurCompanyAmount(defaultValue(os[qbl + 46]));
- cms.setOurCommitteeShare(defaultValue(os[qbl + 47]));
- cms.setOurCompanyReceivable(defaultValue(os[qbl + 48]));
+ cms.setManagementRatio(defaultValue(os[qbl + 40]));
+ cms.setOurCompanyAmount(defaultValue(os[qbl + 41]));
+ cms.setOurCommitteeShare(defaultValue(os[qbl + 42]));
+ cms.setOurCompanyReceivable(defaultValue(os[qbl + 43]));
contractDto.setContractManagementShare(cms);
}
@@ -156,19 +168,27 @@
cad.setAnnualAmount(defaultValue(os[qbl + 29]));
cad.setTotalAmount(defaultValue(os[qbl + 30]));
cad.setSettlementMethod(defaultValue(os[qbl + 31]));
- cad.setSettlementAmount(defaultValue(os[qbl + 32]));
- cad.setFeeType(defaultValue(os[qbl + 33]));
- cad.setAccountInfo(defaultValue(os[qbl + 34]));
- cad.setMainMeterNo(defaultValue(os[qbl + 35]));
- cad.setSubMeterNo(defaultValue(os[qbl + 36]));
- cad.setLastMonthReading(defaultValue(os[qbl + 37]));
- cad.setCurrentMonthReading(defaultValue(os[qbl + 38]));
- cad.setCurrentPeriodConsumption(defaultValue(os[qbl + 39]));
- cad.setElectricityUnitPrice(defaultValue(os[qbl + 40]));
- cad.setElectricityFee(defaultValue(os[qbl + 41]));
- cad.setDeposit(defaultValue(os[qbl + 42]));
- cad.setSettlementCycle(defaultValue(os[qbl + 43]));
- cad.setPaymentRemark(defaultValue(os[qbl + 44]));
+
+ cad.setAccountInfo(defaultValue(os[qbl + 32]));
+ cad.setMainMeterNo(defaultValue(os[qbl + 33]));
+ cad.setSubMeterNo(defaultValue(os[qbl + 34]));
+ cad.setDeposit(defaultValue(os[qbl + 35]));
+ cad.setSettlementCycle(defaultValue(os[qbl + 38]));
+ cad.setPaymentRemark(defaultValue(os[qbl + 39]));
+//
+// cad.setSettlementAmount(defaultValue(os[qbl + 32]));
+// cad.setFeeType(defaultValue(os[qbl + 33]));
+// cad.setAccountInfo(defaultValue(os[qbl + 34]));
+// cad.setMainMeterNo(defaultValue(os[qbl + 35]));
+// cad.setSubMeterNo(defaultValue(os[qbl + 36]));
+// cad.setLastMonthReading(defaultValue(os[qbl + 37]));
+// cad.setCurrentMonthReading(defaultValue(os[qbl + 38]));
+// cad.setCurrentPeriodConsumption(defaultValue(os[qbl + 39]));
+// cad.setElectricityUnitPrice(defaultValue(os[qbl + 40]));
+// cad.setElectricityFee(defaultValue(os[qbl + 41]));
+// cad.setDeposit(defaultValue(os[qbl + 42]));
+// cad.setSettlementCycle(defaultValue(os[qbl + 43]));
+// cad.setPaymentRemark(defaultValue(os[qbl + 44]));
contractDto.setContractAmountDetail(cad);
}
--
Gitblit v1.8.0