From 4832929a1125aea9dc78e3c5e3b01d42eb38e54c Mon Sep 17 00:00:00 2001
From: gxwebsoft <170083662@qq.com>
Date: Fri, 6 Feb 2026 12:39:58 +0800
Subject: [PATCH] 1

---
 .../CreditJudgmentDebtorController.java       | 24 +++++++++++++++++--
 .../CreditJudgmentDebtorImportParam.java      | 18 ++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java
index f1626f8..c4c2236 100644
--- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java
+++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java
@@ -328,10 +328,30 @@ public class CreditJudgmentDebtorController extends BaseController {
         entity.setCaseNumber(param.getCaseNumber());
         entity.setName1(param.getName1());
         String debtorName = ImportHelper.isBlank(param.getName()) ? param.getName1() : param.getName();
+        if (debtorName != null) {
+            debtorName = debtorName.trim();
+        }
+        // Some upstream XLS templates store party/company name in "原告/上诉人/被告/第三人" columns.
+        // When present, use them to populate the debtor "name" for compatibility.
+        if (!ImportHelper.isBlank(param.getPlaintiffAppellant())) {
+            debtorName = param.getPlaintiffAppellant().trim();
+        }
+        if (!ImportHelper.isBlank(param.getAppellee())) {
+            debtorName = param.getAppellee().trim();
+        }
+        if (!ImportHelper.isBlank(param.getOtherPartiesThirdParty())) {
+            debtorName = param.getOtherPartiesThirdParty().trim();
+        }
         entity.setName(debtorName);
         entity.setCode(param.getCode());
-        entity.setOccurrenceTime(param.getOccurrenceTime());
-        entity.setAmount(param.getAmount());
+        String occurrenceTime = !ImportHelper.isBlank(param.getOccurrenceTime2())
+            ? param.getOccurrenceTime2().trim()
+            : (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null);
+        entity.setOccurrenceTime(occurrenceTime);
+        String amount = !ImportHelper.isBlank(param.getInvolvedAmount2())
+            ? param.getInvolvedAmount2().trim()
+            : (param.getAmount() != null ? param.getAmount().trim() : null);
+        entity.setAmount(amount);
         entity.setCourtName(param.getCourtName());
         entity.setDataStatus(param.getDataStatus());
         entity.setComments(param.getComments());
diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java
index 41b6708..5f63386 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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,4 +39,21 @@ public class CreditJudgmentDebtorImportParam implements Serializable {
 
     @Excel(name = "备注")
     private String comments;
+
+    @Excel(name = "原告/上诉人")
+    private String plaintiffAppellant;
+
+    @Excel(name = "被告/被上诉人")
+    private String appellee;
+
+    @Excel(name = "其他当事人/第三人")
+    private String otherPartiesThirdParty;
+
+    @Schema(description = "发生时间")
+    @Excel(name = "发生时间")
+    private String occurrenceTime2;
+
+    @Schema(description = "涉案金额")
+    @Excel(name = "涉案金额")
+    private String involvedAmount2;
 }