From ecbe4fbaeaa3c457c967041eac70ce81d969ed4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 27 Feb 2026 18:28:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(excel):=20=E8=A7=A3=E5=86=B3Excel=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=97=B6=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84=E5=92=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为CreditCourtAnnouncementImportParam添加ExcelHeaderAlias注解支持多别名映射
- 为CreditJudgmentDebtorImportParam添加ExcelHeaderAlias注解支持多别名映射
- 修复CreditXgxfController中appellee字段取值逻辑，使用正确的数据源
- 统一字段映射规则，确保Excel表头别名能够正确识别
---
 .../com/gxwebsoft/credit/controller/CreditXgxfController.java  | 3 ++-
 .../credit/param/CreditCourtAnnouncementImportParam.java       | 2 ++
 .../credit/param/CreditJudgmentDebtorImportParam.java          | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java
index 9792a31..c988d55 100644
--- a/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java
+++ b/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java
@@ -484,11 +484,12 @@ public class CreditXgxfController extends BaseController {
             : param.getPlaintiffAppellant2();
         String appellee = !ImportHelper.isBlank(param.getAppellee())
             ? param.getAppellee()
-            : param.getAppellee2();
+            : param.getDataType();
         String courtName = !ImportHelper.isBlank(param.getCourtName())
             ? param.getCourtName()
             : param.getCourtName2();
 
+
         entity.setCaseNumber(param.getCaseNumber());
         entity.setType(param.getType());
         entity.setDataType(param.getDataType());
diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java
index ffb47fc..349bc33 100644
--- a/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java
+++ b/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java
@@ -1,6 +1,7 @@
 package com.gxwebsoft.credit.param;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.gxwebsoft.credit.excel.ExcelHeaderAlias;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -46,6 +47,7 @@ public class CreditCourtAnnouncementImportParam implements Serializable {
     private String involvedAmount2;
 
     @Excel(name = "法院")
+    @ExcelHeaderAlias({"公告人","执行法院"})
     private String courtName;
 
     @Excel(name = "数据状态")
diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java
index 6393848..24a2a2c 100644
--- a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java
+++ b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java
@@ -1,6 +1,7 @@
 package com.gxwebsoft.credit.param;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.gxwebsoft.credit.excel.ExcelHeaderAlias;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -26,6 +27,7 @@ public class CreditJudgmentDebtorImportParam implements Serializable {
     private String plaintiffAppellant;
 
     @Excel(name = "被告/被上诉人")
+    @ExcelHeaderAlias({"被执行人名称"})
     private String appellee;
 
     @Excel(name = "其他当事人/第三人")