From 7841fa0bba63218362a14273c94a538d390952f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sun, 8 Feb 2026 02:01:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(credit):=20=E5=A2=9E=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E6=9F=A5=E6=9F=A5=E5=8E=86=E5=8F=B2=E8=A2=AB=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加涉案金额字段用于匹配企查查表头 - 新增执行标的金额兼容字段involvedAmountQcc - 新增执行法院兼容字段courtNameQcc - 实现金额和法院名称的多源数据映射逻辑 - 添加公司ID追踪功能用于数据关联 - 优化导入时的空值检查和数据清理 --- .../CreditJudgmentDebtorController.java | 25 ++++++++++++++++--- .../CreditJudgmentDebtorImportParam.java | 13 ++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java index 5a76726..6ac8405 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java @@ -315,7 +315,9 @@ public class CreditJudgmentDebtorController extends BaseController { || isHeaderValue(param.getCode(), "证件号/组织机构代码") || isHeaderValue(param.getOccurrenceTime(), "立案日期") || isHeaderValue(param.getCourtName(), "法院") - || isHeaderValue(param.getInvolvedAmount(), "执行标的(元)") + || isHeaderValue(param.getCourtNameQcc(), "执行法院") + || isHeaderValue(param.getInvolvedAmount(), "涉案金额") + || isHeaderValue(param.getInvolvedAmountQcc(), "执行标的(元)") || isHeaderValue(param.getDataStatus(), "数据状态"); } @@ -360,8 +362,22 @@ public class CreditJudgmentDebtorController extends BaseController { ? param.getOccurrenceTime2().trim() : (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null); entity.setOccurrenceTime(occurrenceTime); - entity.setAmount(param.getInvolvedAmount()); - entity.setCourtName(param.getCourtName()); + // 兼容企查查历史被执行人：执行标的(元) / 执行法院 + String amount = !ImportHelper.isBlank(param.getInvolvedAmount()) + ? param.getInvolvedAmount() + : param.getInvolvedAmountQcc(); + if (amount != null) { + amount = amount.trim(); + } + entity.setAmount(amount); + + String courtName = !ImportHelper.isBlank(param.getCourtName()) + ? param.getCourtName() + : param.getCourtNameQcc(); + if (courtName != null) { + courtName = courtName.trim(); + } + entity.setCourtName(courtName); entity.setDataStatus(param.getDataStatus()); entity.setComments(param.getComments()); @@ -539,6 +555,9 @@ public class CreditJudgmentDebtorController extends BaseController { if (item.getCompanyId() == null && companyId != null) { item.setCompanyId(companyId); } + if (item.getCompanyId() != null && item.getCompanyId() > 0) { + touchedCompanyIds.add(item.getCompanyId()); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java index 3f77aed..6393848 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java @@ -41,9 +41,22 @@ public class CreditJudgmentDebtorImportParam implements Serializable { @Excel(name = "涉案金额") private String involvedAmount; + /** + * 兼容企查查“历史被执行人”表头：执行标的(元) + * 注意：模板导出仍以标准字段为主，这里仅用于增强导入兼容性。 + */ + @Excel(name = "执行标的(元)") + private String involvedAmountQcc; + @Excel(name = "法院") private String courtName; + /** + * 兼容企查查“历史被执行人”表头：执行法院 + */ + @Excel(name = "执行法院") + private String courtNameQcc; + @Excel(name = "数据状态") private String dataStatus;