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; }