From fbc3756ba78d154477a10e752e3c5e97639ca22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sat, 14 Feb 2026 17:56:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(credit):=20=E4=BC=98=E5=8C=96=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=A0=87=E7=9A=84=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改CreditCourtSessionImportParam中occurrenceTime2字段的Excel名称为开庭时间 - 在CreditJudgmentDebtor实体中新增involvedAmountQcc字段用于存储执行标的金额 - 调整CreditJudgmentDebtorController中的执行标的选择逻辑，优先使用企查查字段 - 重新映射CreditJudicialDocumentImportParam中涉案金额字段的Excel注解配置 --- .../credit/controller/CreditJudgmentDebtorController.java | 6 +++--- .../com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java | 3 +++ .../credit/param/CreditCourtSessionImportParam.java | 2 +- .../credit/param/CreditJudicialDocumentImportParam.java | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java index 3972e1e..a4230a3 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java @@ -368,9 +368,9 @@ public class CreditJudgmentDebtorController extends BaseController { : (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null); entity.setOccurrenceTime(occurrenceTime); // 兼容企查查历史被执行人：执行标的(元) / 执行法院 - String amount = !ImportHelper.isBlank(param.getInvolvedAmount()) - ? param.getInvolvedAmount() - : param.getInvolvedAmountQcc(); + String amount = !ImportHelper.isBlank(param.getInvolvedAmountQcc()) + ? param.getInvolvedAmountQcc() + : param.getInvolvedAmount(); if (amount != null) { amount = amount.trim(); } diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java index 7055966..adf99d4 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java @@ -61,6 +61,9 @@ public class CreditJudgmentDebtor implements Serializable { @Schema(description = "涉案金额") private String amount; + @Schema(description = "执行标的(元)") + private String involvedAmountQcc; + @Schema(description = "法院") private String courtName; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java index 6e77ea7..7d31b72 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java @@ -42,7 +42,7 @@ public class CreditCourtSessionImportParam implements Serializable { @Excel(name = "数据状态") private String dataStatus; - @Excel(name = "发生时间") + @Excel(name = "开庭时间") private String occurrenceTime2; @Excel(name = "涉案金额(元)") diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditJudicialDocumentImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditJudicialDocumentImportParam.java index ea21731..5a756fe 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditJudicialDocumentImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditJudicialDocumentImportParam.java @@ -28,10 +28,10 @@ public class CreditJudicialDocumentImportParam implements Serializable { @Excel(name = "当事人") private String otherPartiesThirdParty; - @Excel(name = "案件金额（元）") + @Excel(name = "涉案金额") private String involvedAmount; - @Excel(name = "涉案金额") + @Excel(name = "案件金额（元）") private String involvedAmount2; @Excel(name = "裁判结果")