diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java index 3972e1e..a4230a3 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java @@ -368,9 +368,9 @@ public class CreditJudgmentDebtorController extends BaseController { : (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null); entity.setOccurrenceTime(occurrenceTime); // 兼容企查查历史被执行人:执行标的(元) / 执行法院 - String amount = !ImportHelper.isBlank(param.getInvolvedAmount()) - ? param.getInvolvedAmount() - : param.getInvolvedAmountQcc(); + String amount = !ImportHelper.isBlank(param.getInvolvedAmountQcc()) + ? param.getInvolvedAmountQcc() + : param.getInvolvedAmount(); if (amount != null) { amount = amount.trim(); } diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java index 7055966..adf99d4 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java @@ -61,6 +61,9 @@ public class CreditJudgmentDebtor implements Serializable { @Schema(description = "涉案金额") private String amount; + @Schema(description = "执行标的(元)") + private String involvedAmountQcc; + @Schema(description = "法院") private String courtName; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java index 6e77ea7..7d31b72 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java @@ -42,7 +42,7 @@ public class CreditCourtSessionImportParam implements Serializable { @Excel(name = "数据状态") private String dataStatus; - @Excel(name = "发生时间") + @Excel(name = "开庭时间") private String occurrenceTime2; @Excel(name = "涉案金额(元)") diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditJudicialDocumentImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditJudicialDocumentImportParam.java index ea21731..5a756fe 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditJudicialDocumentImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditJudicialDocumentImportParam.java @@ -28,10 +28,10 @@ public class CreditJudicialDocumentImportParam implements Serializable { @Excel(name = "当事人") private String otherPartiesThirdParty; - @Excel(name = "案件金额(元)") + @Excel(name = "涉案金额") private String involvedAmount; - @Excel(name = "涉案金额") + @Excel(name = "案件金额(元)") private String involvedAmount2; @Excel(name = "裁判结果")