From ede52b6309454e5a0eb44d775fae1d5cbef56d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sat, 31 Jan 2026 01:42:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(import):=20=E5=AE=8C=E5=96=84=E4=BF=A1?= =?UTF-8?q?=E7=94=A8=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增数据类型和数据状态字段支持 - 添加原告/上诉人、被告/被上诉人等当事人字段 - 增加涉案金额、法院、发生时间等业务字段 - 实现新旧字段兼容性处理逻辑 - 更新导入模板示例数据配置 - 优化导入参数验证规则 - 扩展实体类字段映射关系 --- .../CreditBreachOfTrustController.java | 36 ++++++++++--- .../CreditCaseFilingController.java | 42 +++++++++++++-- .../CreditCourtAnnouncementController.java | 27 ++++++++-- .../CreditCourtSessionController.java | 36 ++++++++++--- .../CreditDeliveryNoticeController.java | 38 ++++++++++++-- .../CreditFinalVersionController.java | 33 ++++++++++-- .../credit/entity/CreditDeliveryNotice.java | 51 +++++++++---------- .../credit/entity/CreditFinalVersion.java | 6 +++ .../param/CreditBreachOfTrustImportParam.java | 28 ++++++++-- .../param/CreditCaseFilingImportParam.java | 27 ++++++++++ .../CreditCourtAnnouncementImportParam.java | 25 ++++++++- .../param/CreditCourtSessionImportParam.java | 24 +++++++++ .../CreditDeliveryNoticeImportParam.java | 27 ++++++++++ .../param/CreditFinalVersionImportParam.java | 26 +++++++++- 14 files changed, 362 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java index b5c40d7..db99bf6 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java @@ -567,10 +567,13 @@ public class CreditBreachOfTrustController extends BaseController { List templateList = new ArrayList<>(); CreditBreachOfTrustImportParam example = new CreditBreachOfTrustImportParam(); + example.setDataType("失信被执行人"); example.setCaseNumber("（2024）示例案号"); example.setPlaintiffAppellant("原告示例"); example.setAppellee("被告示例"); + example.setOtherPartiesThirdParty("第三人示例"); example.setInvolvedAmount("20,293.91"); + example.setDataStatus("正常"); example.setOccurrenceTime("2024-01-01"); example.setCourtName("示例法院"); example.setReleaseDate("2024-01-01"); @@ -591,18 +594,39 @@ public class CreditBreachOfTrustController extends BaseController { } return ImportHelper.isBlank(param.getCaseNumber()) && ImportHelper.isBlank(param.getPlaintiffAppellant()) - && ImportHelper.isBlank(param.getAppellee()); + && ImportHelper.isBlank(param.getPlaintiffAppellant2()) + && ImportHelper.isBlank(param.getAppellee()) + && ImportHelper.isBlank(param.getAppellee2()); } private CreditBreachOfTrust convertImportParamToEntity(CreditBreachOfTrustImportParam param) { CreditBreachOfTrust entity = new CreditBreachOfTrust(); + entity.setDataType(param.getDataType()); entity.setCaseNumber(param.getCaseNumber()); - entity.setPlaintiffAppellant(param.getPlaintiffAppellant()); - entity.setAppellee(param.getAppellee()); - entity.setInvolvedAmount(param.getInvolvedAmount()); - entity.setOccurrenceTime(param.getOccurrenceTime()); - entity.setCourtName(param.getCourtName()); + + String plaintiffAppellant = !ImportHelper.isBlank(param.getPlaintiffAppellant2()) + ? param.getPlaintiffAppellant2() + : param.getPlaintiffAppellant(); + entity.setPlaintiffAppellant(plaintiffAppellant); + + String appellee = !ImportHelper.isBlank(param.getAppellee2()) + ? param.getAppellee2() + : param.getAppellee(); + entity.setAppellee(appellee); + + entity.setOtherPartiesThirdParty(param.getOtherPartiesThirdParty()); + entity.setDataStatus(param.getDataStatus()); + + entity.setInvolvedAmount(!ImportHelper.isBlank(param.getInvolvedAmount2()) + ? param.getInvolvedAmount2() + : param.getInvolvedAmount()); + entity.setOccurrenceTime(!ImportHelper.isBlank(param.getOccurrenceTime2()) + ? param.getOccurrenceTime2() + : param.getOccurrenceTime()); + entity.setCourtName(!ImportHelper.isBlank(param.getCourtName2()) + ? param.getCourtName2() + : param.getCourtName()); entity.setReleaseDate(param.getReleaseDate()); entity.setComments(param.getComments()); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java index a384654..a19fa93 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java @@ -364,9 +364,14 @@ public class CreditCaseFilingController extends BaseController { List templateList = new ArrayList<>(); CreditCaseFilingImportParam example = new CreditCaseFilingImportParam(); + example.setDataType("立案信息"); + example.setPlaintiffAppellant("原告示例"); + example.setAppellee("被告示例"); + example.setOtherPartiesThirdParty2("第三人示例"); + example.setInvolvedAmount("100000"); + example.setDataStatus("正常"); example.setCaseNumber("（2024）示例案号"); example.setCauseOfAction("案由示例"); - example.setOtherPartiesThirdParty("当事人示例"); example.setCourtName("示例法院"); example.setOccurrenceTime("2024-01-01"); example.setComments("备注信息"); @@ -386,21 +391,50 @@ public class CreditCaseFilingController extends BaseController { return true; } return ImportHelper.isBlank(param.getCaseNumber()) + && ImportHelper.isBlank(param.getPlaintiffAppellant()) + && ImportHelper.isBlank(param.getAppellee()) && ImportHelper.isBlank(param.getCauseOfAction()) && ImportHelper.isBlank(param.getOtherPartiesThirdParty()) + && ImportHelper.isBlank(param.getOtherPartiesThirdParty2()) && ImportHelper.isBlank(param.getCourtName()) + && ImportHelper.isBlank(param.getCourtName2()) && ImportHelper.isBlank(param.getOccurrenceTime()) + && ImportHelper.isBlank(param.getOccurrenceTime2()) + && ImportHelper.isBlank(param.getInvolvedAmount()) + && ImportHelper.isBlank(param.getInvolvedAmount2()) + && ImportHelper.isBlank(param.getDataStatus()) + && ImportHelper.isBlank(param.getDataType()) && ImportHelper.isBlank(param.getComments()); } private CreditCaseFiling convertImportParamToEntity(CreditCaseFilingImportParam param) { CreditCaseFiling entity = new CreditCaseFiling(); + // Template compatibility: prefer new columns when present. + String occurrenceTime = !ImportHelper.isBlank(param.getOccurrenceTime2()) + ? param.getOccurrenceTime2() + : param.getOccurrenceTime(); + String otherPartiesThirdParty = !ImportHelper.isBlank(param.getOtherPartiesThirdParty2()) + ? param.getOtherPartiesThirdParty2() + : param.getOtherPartiesThirdParty(); + String courtName = !ImportHelper.isBlank(param.getCourtName2()) + ? param.getCourtName2() + : param.getCourtName(); + String involvedAmount = !ImportHelper.isBlank(param.getInvolvedAmount2()) + ? param.getInvolvedAmount2() + : param.getInvolvedAmount(); + + entity.setDataType(param.getDataType()); + entity.setPlaintiffAppellant(param.getPlaintiffAppellant()); + entity.setAppellee(param.getAppellee()); + entity.setDataStatus(param.getDataStatus()); + entity.setCaseNumber(param.getCaseNumber()); entity.setCauseOfAction(param.getCauseOfAction()); - entity.setOtherPartiesThirdParty(param.getOtherPartiesThirdParty()); - entity.setCourtName(param.getCourtName()); - entity.setOccurrenceTime(param.getOccurrenceTime()); + entity.setOtherPartiesThirdParty(otherPartiesThirdParty); + entity.setCourtName(courtName); + entity.setOccurrenceTime(occurrenceTime); + entity.setInvolvedAmount(involvedAmount); entity.setComments(param.getComments()); return entity; diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java index ae19a1d..01f984e 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java @@ -366,10 +366,14 @@ public class CreditCourtAnnouncementController extends BaseController { CreditCourtAnnouncementImportParam example = new CreditCourtAnnouncementImportParam(); example.setDataType("法院公告"); example.setPlaintiffAppellant("原告示例"); + example.setAppellee("被告示例"); example.setOtherPartiesThirdParty("第三人示例"); example.setOccurrenceTime("2024-01-01"); example.setCaseNumber("（2024）示例案号"); example.setCauseOfAction("案由示例"); + example.setCourtName("示例法院"); + example.setInvolvedAmount("100000"); + example.setDataStatus("正常"); example.setComments("备注信息"); templateList.add(example); @@ -393,12 +397,29 @@ public class CreditCourtAnnouncementController extends BaseController { private CreditCourtAnnouncement convertImportParamToEntity(CreditCourtAnnouncementImportParam param) { CreditCourtAnnouncement entity = new CreditCourtAnnouncement(); - entity.setDataType(param.getDataType()); - entity.setPlaintiffAppellant(param.getPlaintiffAppellant()); - entity.setOtherPartiesThirdParty(param.getOtherPartiesThirdParty()); + String dataType = !ImportHelper.isBlank(param.getDataType2()) + ? param.getDataType2() + : param.getDataType(); + String plaintiffAppellant = !ImportHelper.isBlank(param.getPlaintiffAppellant2()) + ? param.getPlaintiffAppellant2() + : param.getPlaintiffAppellant(); + String otherPartiesThirdParty = !ImportHelper.isBlank(param.getOtherPartiesThirdParty2()) + ? param.getOtherPartiesThirdParty2() + : param.getOtherPartiesThirdParty(); + String involvedAmount = !ImportHelper.isBlank(param.getInvolvedAmount2()) + ? param.getInvolvedAmount2() + : param.getInvolvedAmount(); + + entity.setDataType(dataType); + entity.setPlaintiffAppellant(plaintiffAppellant); + entity.setAppellee(param.getAppellee()); + entity.setOtherPartiesThirdParty(otherPartiesThirdParty); entity.setOccurrenceTime(param.getOccurrenceTime()); entity.setCaseNumber(param.getCaseNumber()); entity.setCauseOfAction(param.getCauseOfAction()); + entity.setCourtName(param.getCourtName()); + entity.setInvolvedAmount(involvedAmount); + entity.setDataStatus(param.getDataStatus()); entity.setComments(param.getComments()); return entity; diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java index a8d310a..aa0cc3a 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java @@ -571,11 +571,16 @@ public class CreditCourtSessionController extends BaseController { List templateList = new ArrayList<>(); CreditCourtSessionImportParam example = new CreditCourtSessionImportParam(); - example.setOtherPartiesThirdParty("当事人"); + example.setDataType("开庭公告"); + example.setPlaintiffAppellant("原告示例"); + example.setAppellee("被告示例"); + example.setOtherPartiesThirdParty2("第三人示例"); example.setCaseNumber("（2024）示例案号"); example.setCauseOfAction("案由示例"); example.setCourtName("示例法院"); example.setOccurrenceTime("2024-01-01"); + example.setInvolvedAmount("100000"); + example.setDataStatus("正常"); example.setComments("备注信息"); templateList.add(example); @@ -599,12 +604,29 @@ public class CreditCourtSessionController extends BaseController { private CreditCourtSession convertImportParamToEntity(CreditCourtSessionImportParam param) { CreditCourtSession entity = new CreditCourtSession(); - entity.setOtherPartiesThirdParty(param.getOtherPartiesThirdParty()); - entity.setOccurrenceTime(param.getOccurrenceTime()); - entity.setCaseNumber(param.getCaseNumber()); - entity.setCauseOfAction(param.getCauseOfAction()); - entity.setCourtName(param.getCourtName()); - entity.setComments(param.getComments()); + // Template compatibility: prefer new columns ("发生时间"/"其他当事人/第三人") when present. + String occurrenceTime = !ImportHelper.isBlank(param.getOccurrenceTime2()) + ? param.getOccurrenceTime2() + : param.getOccurrenceTime(); + String otherPartiesThirdParty = !ImportHelper.isBlank(param.getOtherPartiesThirdParty2()) + ? param.getOtherPartiesThirdParty2() + : param.getOtherPartiesThirdParty(); + String involvedAmount = !ImportHelper.isBlank(param.getInvolvedAmount2()) + ? param.getInvolvedAmount2() + : param.getInvolvedAmount(); + + entity.setDataType(param.getDataType()); + entity.setPlaintiffAppellant(param.getPlaintiffAppellant()); + entity.setAppellee(param.getAppellee()); + entity.setDataStatus(param.getDataStatus()); + entity.setInvolvedAmount(involvedAmount); + + entity.setOtherPartiesThirdParty(otherPartiesThirdParty); + entity.setOccurrenceTime(occurrenceTime); + entity.setCaseNumber(param.getCaseNumber()); + entity.setCauseOfAction(param.getCauseOfAction()); + entity.setCourtName(param.getCourtName()); + entity.setComments(param.getComments()); return entity; } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java index 3521dae..74e6c5d 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java @@ -365,7 +365,12 @@ public class CreditDeliveryNoticeController extends BaseController { List templateList = new ArrayList<>(); CreditDeliveryNoticeImportParam example = new CreditDeliveryNoticeImportParam(); - example.setOtherPartiesThirdParty("第三人示例"); + example.setDataType("送达公告"); + example.setPlaintiffAppellant("原告示例"); + example.setAppellee("被告示例"); + example.setOtherPartiesThirdParty2("第三人示例"); + example.setInvolvedAmount("100000"); + example.setDataStatus("正常"); example.setOccurrenceTime("2024-01-01"); example.setCaseNumber("（2024）示例案号"); example.setCauseOfAction("案由示例"); @@ -387,17 +392,40 @@ public class CreditDeliveryNoticeController extends BaseController { return true; } return ImportHelper.isBlank(param.getCaseNumber()) - && ImportHelper.isBlank(param.getCauseOfAction()); + && ImportHelper.isBlank(param.getCauseOfAction()) + && ImportHelper.isBlank(param.getOtherPartiesThirdParty()) + && ImportHelper.isBlank(param.getOtherPartiesThirdParty2()) + && ImportHelper.isBlank(param.getPlaintiffAppellant()) + && ImportHelper.isBlank(param.getAppellee()); } private CreditDeliveryNotice convertImportParamToEntity(CreditDeliveryNoticeImportParam param) { CreditDeliveryNotice entity = new CreditDeliveryNotice(); - entity.setOtherPartiesThirdParty(param.getOtherPartiesThirdParty()); - entity.setOccurrenceTime(param.getOccurrenceTime()); + String occurrenceTime = !ImportHelper.isBlank(param.getOccurrenceTime2()) + ? param.getOccurrenceTime2() + : param.getOccurrenceTime(); + String otherPartiesThirdParty = !ImportHelper.isBlank(param.getOtherPartiesThirdParty2()) + ? param.getOtherPartiesThirdParty2() + : param.getOtherPartiesThirdParty(); + String courtName = !ImportHelper.isBlank(param.getCourtName2()) + ? param.getCourtName2() + : param.getCourtName(); + String involvedAmount = !ImportHelper.isBlank(param.getInvolvedAmount2()) + ? param.getInvolvedAmount2() + : param.getInvolvedAmount(); + + entity.setDataType(param.getDataType()); + entity.setPlaintiffAppellant(param.getPlaintiffAppellant()); + entity.setAppellee(param.getAppellee()); + entity.setInvolvedAmount(involvedAmount); + entity.setDataStatus(param.getDataStatus()); + + entity.setOtherPartiesThirdParty(otherPartiesThirdParty); + entity.setOccurrenceTime(occurrenceTime); entity.setCaseNumber(param.getCaseNumber()); entity.setCauseOfAction(param.getCauseOfAction()); - entity.setCourtName(param.getCourtName()); + entity.setCourtName(courtName); entity.setComments(param.getComments()); return entity; diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java index 5c2d97b..09b0817 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java @@ -574,7 +574,9 @@ public class CreditFinalVersionController extends BaseController { example.setCaseNumber("（2024）示例案号"); example.setPlaintiffAppellant("原告示例"); example.setAppellee("被告示例"); + example.setOtherPartiesThirdParty("第三人示例"); example.setInvolvedAmount("20,293.91"); + example.setDataStatus("正常"); example.setCourtName("示例法院"); example.setOccurrenceTime("2024-01-01"); example.setFinalDate("2024-01-01"); @@ -600,13 +602,34 @@ public class CreditFinalVersionController extends BaseController { private CreditFinalVersion convertImportParamToEntity(CreditFinalVersionImportParam param) { CreditFinalVersion entity = new CreditFinalVersion(); + String plaintiffAppellant = !ImportHelper.isBlank(param.getPlaintiffAppellant2()) + ? param.getPlaintiffAppellant2() + : param.getPlaintiffAppellant(); + String appellee = !ImportHelper.isBlank(param.getAppellee2()) + ? param.getAppellee2() + : param.getAppellee(); + String otherPartiesThirdParty = !ImportHelper.isBlank(param.getOtherPartiesThirdParty()) + ? param.getOtherPartiesThirdParty() + : param.getOtherPartiesThirdParty2(); + String involvedAmount = !ImportHelper.isBlank(param.getInvolvedAmount2()) + ? param.getInvolvedAmount2() + : param.getInvolvedAmount(); + String courtName = !ImportHelper.isBlank(param.getCourtName2()) + ? param.getCourtName2() + : param.getCourtName(); + String occurrenceTime = !ImportHelper.isBlank(param.getOccurrenceTime2()) + ? param.getOccurrenceTime2() + : param.getOccurrenceTime(); + entity.setCaseNumber(param.getCaseNumber()); - entity.setPlaintiffAppellant(param.getPlaintiffAppellant()); - entity.setAppellee(param.getAppellee()); + entity.setPlaintiffAppellant(plaintiffAppellant); + entity.setAppellee(appellee); entity.setUnfulfilledAmount(param.getUnfulfilledAmount()); - entity.setInvolvedAmount(param.getInvolvedAmount()); - entity.setCourtName(param.getCourtName()); - entity.setOccurrenceTime(param.getOccurrenceTime()); + entity.setInvolvedAmount(involvedAmount); + entity.setOtherPartiesThirdParty(otherPartiesThirdParty); + entity.setDataStatus(param.getDataStatus()); + entity.setCourtName(courtName); + entity.setOccurrenceTime(occurrenceTime); entity.setFinalDate(param.getFinalDate()); entity.setComments(param.getComments()); diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditDeliveryNotice.java b/src/main/java/com/gxwebsoft/credit/entity/CreditDeliveryNotice.java index e6dab67..e03a4a4 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditDeliveryNotice.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditDeliveryNotice.java @@ -30,39 +30,38 @@ public class CreditDeliveryNotice implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; - @Schema(description = "案号") - private String caseNumber; + @Schema(description = "案号") + private String caseNumber; - @Schema(description = "链接地址") - private String url; + @Schema(description = "链接地址") + private String url; - @Schema(description = "案由") - private String causeOfAction; + @Schema(description = "案由") + private String causeOfAction; - @Schema(description = "当事人") - private String otherPartiesThirdParty; + @Schema(description = "当事人") + private String otherPartiesThirdParty; - @Schema(description = "法院") - private String courtName; + @Schema(description = "法院") + private String courtName; - @Schema(description = "发布日期") - private String occurrenceTime; + @Schema(description = "发布日期") + private String occurrenceTime; -// @Schema(description = "数据类型") -// private String dataType; -// -// @Schema(description = "原告/上诉人") -// private String plaintiffAppellant; -// -// @Schema(description = "被告/被上诉人") -// @TableField("Appellee") -// private String appellee; + @Schema(description = "数据类型") + private String dataType; -// @Schema(description = "涉案金额") -// private String involvedAmount; -// -// @Schema(description = "数据状态") -// private String dataStatus; + @Schema(description = "原告/上诉人") + private String plaintiffAppellant; + + @Schema(description = "被告/被上诉人") + private String appellee; + + @Schema(description = "涉案金额") + private String involvedAmount; + + @Schema(description = "数据状态") + private String dataStatus; @Schema(description = "企业ID") private Integer companyId; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditFinalVersion.java b/src/main/java/com/gxwebsoft/credit/entity/CreditFinalVersion.java index be09c32..868fb2c 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditFinalVersion.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditFinalVersion.java @@ -48,6 +48,9 @@ public class CreditFinalVersion implements Serializable { @Schema(description = "执行标的（元）") private String involvedAmount; + @Schema(description = "其他当事人/第三人") + private String otherPartiesThirdParty; + @Schema(description = "执行法院") private String courtName; @@ -57,6 +60,9 @@ public class CreditFinalVersion implements Serializable { @Schema(description = "终本日期") private String finalDate; + @Schema(description = "数据状态") + private String dataStatus; + @Schema(description = "企业ID") private Integer companyId; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditBreachOfTrustImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditBreachOfTrustImportParam.java index 0be1895..e90f364 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditBreachOfTrustImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditBreachOfTrustImportParam.java @@ -1,8 +1,6 @@ package com.gxwebsoft.credit.param; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -14,6 +12,8 @@ import java.io.Serializable; public class CreditBreachOfTrustImportParam implements Serializable { private static final long serialVersionUID = 1L; + @Excel(name = "数据类型") + private String dataType; @Excel(name = "案号") private String caseNumber; @@ -21,25 +21,43 @@ public class CreditBreachOfTrustImportParam implements Serializable { @Excel(name = "失信被执行人") private String plaintiffAppellant; + @Excel(name = "原告/上诉人") + private String plaintiffAppellant2; + @Excel(name = "疑似申请执行人") private String appellee; + @Excel(name = "被告/被上诉人") + private String appellee2; + + @Excel(name = "其他当事人/第三人") + private String otherPartiesThirdParty; + + @Excel(name = "数据状态") + private String dataStatus; + @Excel(name = "涉案金额(元)") private String involvedAmount; + @Excel(name = "涉案金额") + private String involvedAmount2; + @Excel(name = "执行法院") private String courtName; + @Excel(name = "法院") + private String courtName2; + @Excel(name = "立案日期") private String occurrenceTime; + @Excel(name = "发生时间") + private String occurrenceTime2; + @Excel(name = "发布日期") private String releaseDate; @Excel(name = "备注") private String comments; -// @Excel(name = "原告/上诉人") -// private String plaintiffAppellant2; - } diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditCaseFilingImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditCaseFilingImportParam.java index 3a294af..517f455 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditCaseFilingImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditCaseFilingImportParam.java @@ -12,6 +12,18 @@ import java.io.Serializable; public class CreditCaseFilingImportParam implements Serializable { private static final long serialVersionUID = 1L; + @Excel(name = "数据类型") + private String dataType; + + @Excel(name = "原告/上诉人") + private String plaintiffAppellant; + + @Excel(name = "被告/被上诉人") + private String appellee; + + @Excel(name = "数据状态") + private String dataStatus; + @Excel(name = "案号") private String caseNumber; @@ -21,12 +33,27 @@ public class CreditCaseFilingImportParam implements Serializable { @Excel(name = "当事人") private String otherPartiesThirdParty; + @Excel(name = "其他当事人/第三人") + private String otherPartiesThirdParty2; + @Excel(name = "法院") private String courtName; + @Excel(name = "执行法院") + private String courtName2; + @Excel(name = "立案日期") private String occurrenceTime; + @Excel(name = "发生时间") + private String occurrenceTime2; + + @Excel(name = "涉案金额") + private String involvedAmount; + + @Excel(name = "涉案金额(元)") + private String involvedAmount2; + @Excel(name = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java index 41e0a1c..6a2422b 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java @@ -1,7 +1,6 @@ package com.gxwebsoft.credit.param; import cn.afterturn.easypoi.excel.annotation.Excel; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -22,12 +21,36 @@ public class CreditCourtAnnouncementImportParam implements Serializable { @Excel(name = "当事人") private String otherPartiesThirdParty; + @Excel(name = "其他当事人/第三人") + private String otherPartiesThirdParty2; + @Excel(name = "公告类型") private String dataType; + @Excel(name = "数据类型") + private String dataType2; + @Excel(name = "公告人") private String plaintiffAppellant; + @Excel(name = "原告/上诉人") + private String plaintiffAppellant2; + + @Excel(name = "被告/被上诉人") + private String appellee; + + @Excel(name = "涉案金额") + private String involvedAmount; + + @Excel(name = "涉案金额(元)") + private String involvedAmount2; + + @Excel(name = "法院") + private String courtName; + + @Excel(name = "数据状态") + private String dataStatus; + @Excel(name = "刊登日期") private String occurrenceTime; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java index 44ea4f5..d4007d9 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditCourtSessionImportParam.java @@ -12,6 +12,9 @@ import java.io.Serializable; public class CreditCourtSessionImportParam implements Serializable { private static final long serialVersionUID = 1L; + @Excel(name = "数据类型") + private String dataType; + @Excel(name = "案号") private String caseNumber; @@ -21,12 +24,33 @@ public class CreditCourtSessionImportParam implements Serializable { @Excel(name = "当事人") private String otherPartiesThirdParty; + @Excel(name = "其他当事人/第三人") + private String otherPartiesThirdParty2; + + @Excel(name = "原告/上诉人") + private String plaintiffAppellant; + + @Excel(name = "被告/被上诉人") + private String appellee; + + @Excel(name = "涉案金额") + private String involvedAmount; + + @Excel(name = "涉案金额(元)") + private String involvedAmount2; + + @Excel(name = "数据状态") + private String dataStatus; + @Excel(name = "法院") private String courtName; @Excel(name = "开庭时间") private String occurrenceTime; + @Excel(name = "发生时间") + private String occurrenceTime2; + @Excel(name = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditDeliveryNoticeImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditDeliveryNoticeImportParam.java index a83565a..214e1a7 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditDeliveryNoticeImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditDeliveryNoticeImportParam.java @@ -12,6 +12,24 @@ import java.io.Serializable; public class CreditDeliveryNoticeImportParam implements Serializable { private static final long serialVersionUID = 1L; + @Excel(name = "数据类型") + private String dataType; + + @Excel(name = "原告/上诉人") + private String plaintiffAppellant; + + @Excel(name = "被告/被上诉人") + private String appellee; + + @Excel(name = "数据状态") + private String dataStatus; + + @Excel(name = "涉案金额") + private String involvedAmount; + + @Excel(name = "涉案金额(元)") + private String involvedAmount2; + @Excel(name = "案号") private String caseNumber; @@ -21,12 +39,21 @@ public class CreditDeliveryNoticeImportParam implements Serializable { @Excel(name = "当事人") private String otherPartiesThirdParty; + @Excel(name = "其他当事人/第三人") + private String otherPartiesThirdParty2; + @Excel(name = "法院") private String courtName; + @Excel(name = "执行法院") + private String courtName2; + @Excel(name = "发布日期") private String occurrenceTime; + @Excel(name = "发生时间") + private String occurrenceTime2; + @Excel(name = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditFinalVersionImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditFinalVersionImportParam.java index 93b08ea..4aea1d7 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditFinalVersionImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditFinalVersionImportParam.java @@ -1,8 +1,6 @@ package com.gxwebsoft.credit.param; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -20,21 +18,45 @@ public class CreditFinalVersionImportParam implements Serializable { @Excel(name = "被执行人") private String appellee; + @Excel(name = "被告/被上诉人") + private String appellee2; + @Excel(name = "疑似申请执行人") private String plaintiffAppellant; + @Excel(name = "原告/上诉人") + private String plaintiffAppellant2; + + @Excel(name = "其他当事人/第三人") + private String otherPartiesThirdParty; + + @Excel(name = "当事人") + private String otherPartiesThirdParty2; + + @Excel(name = "数据状态") + private String dataStatus; + @Excel(name = "未履行金额（元）") private String unfulfilledAmount; @Excel(name = "执行标的（元）") private String involvedAmount; + @Excel(name = "涉案金额") + private String involvedAmount2; + @Excel(name = "执行法院") private String courtName; + @Excel(name = "法院") + private String courtName2; + @Excel(name = "立案日期") private String occurrenceTime; + @Excel(name = "发生时间") + private String occurrenceTime2; + @Excel(name = "终本日期") private String finalDate;