diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java index 9792a31..c988d55 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java @@ -484,11 +484,12 @@ public class CreditXgxfController extends BaseController { : param.getPlaintiffAppellant2(); String appellee = !ImportHelper.isBlank(param.getAppellee()) ? param.getAppellee() - : param.getAppellee2(); + : param.getDataType(); String courtName = !ImportHelper.isBlank(param.getCourtName()) ? param.getCourtName() : param.getCourtName2(); + entity.setCaseNumber(param.getCaseNumber()); entity.setType(param.getType()); entity.setDataType(param.getDataType()); diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java index ffb47fc..349bc33 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java @@ -1,6 +1,7 @@ package com.gxwebsoft.credit.param; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.gxwebsoft.credit.excel.ExcelHeaderAlias; import lombok.Data; import java.io.Serializable; @@ -46,6 +47,7 @@ public class CreditCourtAnnouncementImportParam implements Serializable { private String involvedAmount2; @Excel(name = "法院") + @ExcelHeaderAlias({"公告人","执行法院"}) private String courtName; @Excel(name = "数据状态") diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java index 6393848..24a2a2c 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 com.gxwebsoft.credit.excel.ExcelHeaderAlias; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -26,6 +27,7 @@ public class CreditJudgmentDebtorImportParam implements Serializable { private String plaintiffAppellant; @Excel(name = "被告/被上诉人") + @ExcelHeaderAlias({"被执行人名称"}) private String appellee; @Excel(name = "其他当事人/第三人")