From 1b2d09049a204b923747bf88e99409bf2d105dbb Mon Sep 17 00:00:00 2001
From: gxwebsoft <170083662@qq.com>
Date: Fri, 6 Feb 2026 16:58:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(credit):=20=E8=B0=83=E6=95=B4=E5=88=A4?=
 =?UTF-8?q?=E5=86=B3=E5=80=BA=E5=8A=A1=E4=BA=BA=E5=AE=9E=E4=BD=93=E7=9A=84?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将CreditJudgmentDebtor实体中的amount字段描述从"执行标的(元)"改为"涉案金额"
- 将CreditJudgmentDebtorImportParam参数类中的amount字段重命名为involvedAmount
- 更新控制器中对金额字段的引用，使用新的involvedAmount字段名
- 移除参数类中重复的involvedAmount2字段定义
- 在导入模板示例中移除金额字段的默认值设置
---
 .../controller/CreditJudgmentDebtorController.java       | 8 ++------
 .../gxwebsoft/credit/entity/CreditJudgmentDebtor.java    | 2 +-
 .../credit/param/CreditJudgmentDebtorImportParam.java    | 9 +++------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java
index 993ef29..72a5517 100644
--- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java
+++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java
@@ -278,7 +278,6 @@ public class CreditJudgmentDebtorController extends BaseController {
         example.setName("某某公司");
         example.setCode("1234567890");
         example.setOccurrenceTime("2024-01-10");
-        example.setAmount("100000");
         example.setDataStatus("已公开");
         example.setComments("备注信息");
         templateList.add(example);
@@ -311,7 +310,7 @@ public class CreditJudgmentDebtorController extends BaseController {
             || isHeaderValue(param.getCode(), "证件号/组织机构代码")
             || isHeaderValue(param.getOccurrenceTime(), "立案日期")
             || isHeaderValue(param.getCourtName(), "法院")
-            || isHeaderValue(param.getAmount(), "执行标的(元)")
+            || isHeaderValue(param.getInvolvedAmount(), "执行标的(元)")
             || isHeaderValue(param.getDataStatus(), "数据状态");
     }
 
@@ -356,10 +355,7 @@ public class CreditJudgmentDebtorController extends BaseController {
             ? 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.setAmount(param.getInvolvedAmount());
         entity.setCourtName(param.getCourtName());
         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 e4ea7c0..7055966 100644
--- a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java
+++ b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java
@@ -58,7 +58,7 @@ public class CreditJudgmentDebtor implements Serializable {
     @Schema(description = "发生时间")
     private String occurrenceTime;
 
-    @Schema(description = "执行标的(元)")
+    @Schema(description = "涉案金额")
     private String amount;
 
     @Schema(description = "法院")
diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java
index 86d6c60..3f77aed 100644
--- a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java
+++ b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java
@@ -37,8 +37,9 @@ public class CreditJudgmentDebtorImportParam implements Serializable {
     @Excel(name = "立案日期")
     private String occurrenceTime;
 
-    @Excel(name = "执行标的(元)")
-    private String amount;
+    @Schema(description = "涉案金额")
+    @Excel(name = "涉案金额")
+    private String involvedAmount;
 
     @Excel(name = "法院")
     private String courtName;
@@ -52,8 +53,4 @@ public class CreditJudgmentDebtorImportParam implements Serializable {
     @Schema(description = "发生时间")
     @Excel(name = "发生时间")
     private String occurrenceTime2;
-
-    @Schema(description = "涉案金额")
-    @Excel(name = "涉案金额")
-    private String involvedAmount2;
 }