From 0dce41f2db67b306ed6798045a0759a28e6d45e9 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, 3 Jan 2026 19:57:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(credit):=20=E4=BF=AE=E5=A4=8D=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=A0=87=E7=9A=84=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将CreditJudgmentDebtor实体类中的amount字段类型从BigDecimal改为String
- 将CreditJudgmentDebtorParam参数类中的amount字段类型从BigDecimal改为String
- 在导入处理中移除对amount字段的BigDecimal解析
- 添加对name1字段的空值检查
- 调整债务人名称赋值逻辑，优先使用name字段，为空时使用name1字段
- 添加调试日志输出导入数据大小
---
 .../controller/CreditJudgmentDebtorController.java       | 9 ++++++---
 .../gxwebsoft/credit/entity/CreditJudgmentDebtor.java    | 2 +-
 .../credit/param/CreditJudgmentDebtorParam.java          | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java
index 2b72eb0..f97f0e4 100644
--- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java
+++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java
@@ -143,6 +143,7 @@ public class CreditJudgmentDebtorController extends BaseController {
             ExcelImportSupport.ImportResult<CreditJudgmentDebtorImportParam> importResult = ExcelImportSupport.read(
                 file, CreditJudgmentDebtorImportParam.class, this::isEmptyImportRow);
             List<CreditJudgmentDebtorImportParam> list = importResult.getData();
+          System.out.println("list = " + list.size());
             int usedTitleRows = importResult.getTitleRows();
             int usedHeadRows = importResult.getHeadRows();
 
@@ -244,11 +245,11 @@ public class CreditJudgmentDebtorController extends BaseController {
     }
 
     private boolean isEmptyImportRow(CreditJudgmentDebtorImportParam param) {
+      System.out.println("param2 = " + param);
         if (param == null) {
             return true;
         }
         return ImportHelper.isBlank(param.getCaseNumber())
-            && ImportHelper.isBlank(param.getName())
             && ImportHelper.isBlank(param.getCode());
     }
 
@@ -256,10 +257,12 @@ public class CreditJudgmentDebtorController extends BaseController {
         CreditJudgmentDebtor entity = new CreditJudgmentDebtor();
 
         entity.setCaseNumber(param.getCaseNumber());
-        entity.setName(param.getName());
+        entity.setName1(param.getName1());
+        String debtorName = ImportHelper.isBlank(param.getName()) ? param.getName1() : param.getName();
+        entity.setName(debtorName);
         entity.setCode(param.getCode());
         entity.setOccurrenceTime(param.getOccurrenceTime());
-        entity.setAmount(ImportHelper.parseBigDecimal(param.getAmount(), "执行标的(元)"));
+        entity.setAmount(param.getAmount());
         entity.setDataStatus(param.getDataStatus());
         entity.setComments(param.getComments());
 
diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java
index 3f88e99..444d376 100644
--- a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java
+++ b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java
@@ -45,7 +45,7 @@ public class CreditJudgmentDebtor implements Serializable {
     private String occurrenceTime;
 
     @Schema(description = "执行标的(元)")
-    private BigDecimal amount;
+    private String amount;
 
     @Schema(description = "法院")
     private String courtName;
diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorParam.java
index 83b60e5..4d077cc 100644
--- a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorParam.java
+++ b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorParam.java
@@ -41,7 +41,7 @@ public class CreditJudgmentDebtorParam extends BaseParam {
 
     @Schema(description = "执行标的(元)")
     @QueryField(type = QueryType.EQ)
-    private BigDecimal amount;
+    private String amount;
 
     @Schema(description = "法院")
     private String courtName;