diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java index f2f6269..4eea5cc 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java @@ -641,6 +641,9 @@ public class CreditGqdjController extends BaseController { private CreditGqdj convertImportParamToEntity(CreditGqdjImportParam param) { CreditGqdj entity = new CreditGqdj(); + if(param.getCaseNumber2() != null){ + entity.setCaseNumber(param.getCaseNumber2()); + } entity.setCaseNumber(param.getCaseNumber()); entity.setAppellee(param.getAppellee()); entity.setPlaintiffAppellant(param.getPlaintiffAppellant()); diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditGqdj.java b/src/main/java/com/gxwebsoft/credit/entity/CreditGqdj.java index 13d6da2..9b3c7b9 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditGqdj.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditGqdj.java @@ -31,7 +31,7 @@ public class CreditGqdj implements Serializable { private Integer id; @Schema(description = "执行通知文书号") - private String caseNumber; + private String caseNumber;; @Schema(description = "被执行人") private String appellee; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditGqdjImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditGqdjImportParam.java index 41b3bfa..e4db9db 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditGqdjImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditGqdjImportParam.java @@ -16,6 +16,9 @@ public class CreditGqdjImportParam implements Serializable { @Excel(name = "执行通知文书号") private String caseNumber; + @Excel(name = "暗号") + private String caseNumber2; + @Excel(name = "被执行人") private String appellee; @@ -40,6 +43,12 @@ public class CreditGqdjImportParam implements Serializable { @Excel(name = "冻结日期至") private String freezeDateEnd; + @Excel(name = "冻结开始日期") + private String freezeDateStart2; + + @Excel(name = "冻结结束日期") + private String freezeDateEnd2; + @Excel(name = "公示日期") private String publicDate; }