导入优化,后端V1

This commit is contained in:
xiaocp2009 2025-09-02 15:03:46 +08:00
parent e0b314804f
commit 43bdfbc5dc
40 changed files with 65 additions and 39 deletions

View File

@ -94,7 +94,7 @@ public class BusinessCategoryImportListener extends AnalysisEventListener<Busine
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class BusinessPercentageImportListener extends AnalysisEventListener<Busi
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class BusinessSubcategoryImportListener extends AnalysisEventListener<Bus
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class MpsDetailEntryImportListener extends AnalysisEventListener<MpsDetai
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class MpsEmpAddItemsImportListener extends AnalysisEventListener<MpsEmpAd
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class MpsMagneticcardImportListener extends AnalysisEventListener<MpsMagn
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -96,7 +96,7 @@ public class MpsManualPricingImportListener extends AnalysisEventListener<MpsMan
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class MpsMarketImportListener extends AnalysisEventListener<MpsMarketImpo
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class MpsTrafficImportListener extends AnalysisEventListener<MpsTrafficIm
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -2,7 +2,11 @@ package org.dromara.original.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.Pattern;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.annotation.ExcelRequired;
import org.dromara.common.excel.convert.ExcelDictConvert;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -38,132 +42,154 @@ public class OriginalWaterImportVo implements Serializable {
* 客户代码
*/
@ExcelProperty(value = "客户代码")
@NotBlank(message = "客户代码不能为空")
private String customerCode;
/**
* 姓名
*/
@ExcelProperty(value = "姓名")
@NotBlank(message = "姓名不能为空")
private String name;
/**
* 地址
*/
@ExcelProperty(value = "地址")
@NotBlank(message = "地址不能为空")
private String address;
/**
* 水表数
*/
@ExcelProperty(value = "水表数")
@Pattern(message = "水表数错误-必须为正整数", regexp = "^\\d+$")
private String waterMeterNumber;
/**
* 银行流水号
*/
@ExcelProperty(value = "银行流水号")
@NotBlank(message = "银行流水号不能为空")
private String bankTransactionId;
/**
* 缴费笔数
*/
@ExcelProperty(value = "缴费笔数")
@Pattern(message = "缴费笔数错误-必须为正整数", regexp = "^\\d+$")
private String paymentCount;
/**
* 本次缴费金额
*/
@ExcelProperty(value = "本次缴费金额")
@Pattern(message = "本次缴费金额错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String currentPaymentAmount;
/**
* 本缴费金额
*/
@ExcelProperty(value = "本缴费金额")
@Pattern(message = "本缴费金额错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String paymentAmount;
/**
* 水费单价
*/
@ExcelProperty(value = "水费单价")
@Pattern(message = "水费单价错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String waterUnitPrice;
/**
* 水费
*/
@ExcelProperty(value = "水费")
@Pattern(message = "水费错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String waterFee;
/**
* 污水处理费单价
*/
@ExcelProperty(value = "污水处理费单价")
@Pattern(message = "污水处理费单价错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String sewageUnitPrice;
/**
* 污水处理费
*/
@ExcelProperty(value = "污水处理费")
@Pattern(message = "污水处理费错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String sewageFee;
/**
* 附加费单价
*/
@ExcelProperty(value = "附加费单价")
@Pattern(message = "附加费单价错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String surchargeUnitPrice;
/**
* 附加费
*/
@ExcelProperty(value = "附加费")
@Pattern(message = "附加费错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String surcharge;
/**
* 违约金
*/
@ExcelProperty(value = "违约金")
@Pattern(message = "违约金错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String penalty;
/**
* 应收合计
*/
@ExcelProperty(value = "应收合计")
@Pattern(message = "应收合计错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String totalReceivable;
/**
* 前次交费余额
*/
@ExcelProperty(value = "前次交费余额")
@Pattern(message = "前次交费余额错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String previousBalance;
/**
* 本次交费余额
*/
@ExcelProperty(value = "本次交费余额")
@Pattern(message = "本次交费余额错误", regexp = "^-?(0|[1-9]\\d*)(\\.\\d{1,2})?$")
private String currentBalance;
/**
* 缴费日期
*/
@ExcelProperty(value = "缴费日期")
@Pattern(message = "缴费日期错误", regexp = "^\\d{4}(-?)(0[1-9]|1[0-2])\\1(0[1-9]|[12][0-9]|3[01])$")
private String paymentDate;
/**
* 支付状态
*/
@ExcelProperty(value = "支付状态")
@NotBlank(message = "支付状态不能为空")
private String paymentStatus;
/**
* 入账状态
*/
@ExcelProperty(value = "入账状态")
@NotBlank(message = "入账状态不能为空")
private String accountingStatus;
/**
* 计价月份
*/
@ExcelProperty(value = "计价月份")
@NotBlank(message = "计价月份不能为空")
private String importTime;

View File

@ -97,7 +97,7 @@ public class MpsImportDianziShebaokaImportListener extends AnalysisEventListener
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class MpsImportDianziYibaoImportListener extends AnalysisEventListener<Mp
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class MpsImportHuinongtongDetailImportListener extends AnalysisEventListe
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class MpsImportHuinongtongInfoImportListener extends AnalysisEventListene
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class MpsImportIndvCifImportListener extends AnalysisEventListener<MpsImp
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class MpsImportNewOpenCardImportListener extends AnalysisEventListener<Mp
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class MpsImportSpecialImportListener extends AnalysisEventListener<MpsImp
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class MpsImportZhiefuIndvImportListener extends AnalysisEventListener<Mps
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class MpsImportZhigongShebaokaImportListener extends AnalysisEventListene
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -96,7 +96,7 @@ public class OriginalBatchAccountInfoImportListener extends AnalysisEventListene
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class OriginalBatchBankCardInfoImportListener extends AnalysisEventListen
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class OriginalDianfeiImportListener extends AnalysisEventListener<Origina
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class OriginalEMBankingImportListener extends AnalysisEventListener<Origi
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -95,7 +95,7 @@ public class OriginalGjjPaymentImportListener extends AnalysisEventListener<Orig
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class OriginalHeatImportListener extends AnalysisEventListener<OriginalHe
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -96,7 +96,7 @@ public class OriginalHntSgmxImportListener extends AnalysisEventListener<Origina
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -97,7 +97,7 @@ public class OriginalHntSgsInfoImportListener extends AnalysisEventListener<Orig
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class OriginalMerchantInfoImportListener extends AnalysisEventListener<Or
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class OriginalMerchantTransactionSummary3mImportListener extends Analysis
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class OriginalMerchantTransactionSummaryImportListener extends AnalysisEv
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class OriginalMobileBankInactiveMonthImportListener extends AnalysisEvent
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class OriginalMobileBankInactiveYearImportListener extends AnalysisEventL
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class OriginalMobileBankSignupCompanyImportListener extends AnalysisEvent
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class OriginalMobileBankSignupPersonImportListener extends AnalysisEventL
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -96,7 +96,7 @@ public class OriginalOnlinePaymentImportListener extends AnalysisEventListener<O
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -96,7 +96,7 @@ public class OriginalTrafficImportListener extends AnalysisEventListener<Origina
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -96,7 +96,7 @@ public class OriginalWaterImportListener extends AnalysisEventListener<OriginalW
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class MarketingPerformanceImportListener extends AnalysisEventListener<Ma
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class MarketingValidInvalidImportListener extends AnalysisEventListener<M
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())

View File

@ -94,7 +94,7 @@ public class SysDeptTransferImportListener extends AnalysisEventListener<SysDept
StringBuilder errorMsg = new StringBuilder("数据验证失败,共 ")
.append(failureList.size())
.append(" 条错误:<br/>");
failureList.forEach(pair ->
failureList.stream().limit(10).forEach(pair ->
//errorMsg.append("\n行数据: ")
errorMsg.append("行数[")
.append(pair.getKey())