feat(import): 完善信用数据导入功能

- 新增数据类型和数据状态字段支持
- 添加原告/上诉人、被告/被上诉人等当事人字段
- 增加涉案金额、法院、发生时间等业务字段
- 实现新旧字段兼容性处理逻辑
- 更新导入模板示例数据配置
- 优化导入参数验证规则
- 扩展实体类字段映射关系

src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java

@@ -567,10 +567,13 @@ public class CreditBreachOfTrustController extends BaseController {
         List<CreditBreachOfTrustImportParam> 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());
+        String plaintiffAppellant = !ImportHelper.isBlank(param.getPlaintiffAppellant2())
-        entity.setInvolvedAmount(param.getInvolvedAmount());
+            ? param.getPlaintiffAppellant2()
-        entity.setOccurrenceTime(param.getOccurrenceTime());
+            : param.getPlaintiffAppellant();
-        entity.setCourtName(param.getCourtName());
+        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());
 

src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java

@@ -364,9 +364,14 @@ public class CreditCaseFilingController extends BaseController {
         List<CreditCaseFilingImportParam> 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.setOtherPartiesThirdParty(otherPartiesThirdParty);
-        entity.setCourtName(param.getCourtName());
+        entity.setCourtName(courtName);
-        entity.setOccurrenceTime(param.getOccurrenceTime());
+        entity.setOccurrenceTime(occurrenceTime);
+        entity.setInvolvedAmount(involvedAmount);
         entity.setComments(param.getComments());
 
         return entity;

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());
+        String dataType = !ImportHelper.isBlank(param.getDataType2())
-        entity.setPlaintiffAppellant(param.getPlaintiffAppellant());
+            ? param.getDataType2()
-        entity.setOtherPartiesThirdParty(param.getOtherPartiesThirdParty());
+            : 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;

src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java

@@ -571,11 +571,16 @@ public class CreditCourtSessionController extends BaseController {
         List<CreditCourtSessionImportParam> 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,8 +604,25 @@ public class CreditCourtSessionController extends BaseController {
     private CreditCourtSession convertImportParamToEntity(CreditCourtSessionImportParam param) {
         CreditCourtSession entity = new CreditCourtSession();
 
-      entity.setOtherPartiesThirdParty(param.getOtherPartiesThirdParty());
+        // Template compatibility: prefer new columns ("发生时间"/"其他当事人/第三人") when present.
-      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 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());

src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java

@@ -365,7 +365,12 @@ public class CreditDeliveryNoticeController extends BaseController {
         List<CreditDeliveryNoticeImportParam> 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());
+        String occurrenceTime = !ImportHelper.isBlank(param.getOccurrenceTime2())
-        entity.setOccurrenceTime(param.getOccurrenceTime());
+            ? 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;

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.setPlaintiffAppellant(plaintiffAppellant);
-        entity.setAppellee(param.getAppellee());
+        entity.setAppellee(appellee);
         entity.setUnfulfilledAmount(param.getUnfulfilledAmount());
-        entity.setInvolvedAmount(param.getInvolvedAmount());
+        entity.setInvolvedAmount(involvedAmount);
-        entity.setCourtName(param.getCourtName());
+        entity.setOtherPartiesThirdParty(otherPartiesThirdParty);
-        entity.setOccurrenceTime(param.getOccurrenceTime());
+        entity.setDataStatus(param.getDataStatus());
+        entity.setCourtName(courtName);
+        entity.setOccurrenceTime(occurrenceTime);
         entity.setFinalDate(param.getFinalDate());
         entity.setComments(param.getComments());
 

src/main/java/com/gxwebsoft/credit/entity/CreditDeliveryNotice.java

@@ -48,21 +48,20 @@ public class CreditDeliveryNotice implements Serializable {
     @Schema(description = "发布日期")
     private String occurrenceTime;
 
-//    @Schema(description = "数据类型")
+    @Schema(description = "数据类型")
-//    private String dataType;
+    private String dataType;
-//
-//    @Schema(description = "原告/上诉人")
-//    private String plaintiffAppellant;
-//
-//    @Schema(description = "被告/被上诉人")
-//    @TableField("Appellee")
-//    private String appellee;
 
-//    @Schema(description = "涉案金额")
+    @Schema(description = "原告/上诉人")
-//    private String involvedAmount;
+    private String plaintiffAppellant;
-//
+
-//    @Schema(description = "数据状态")
+    @Schema(description = "被告/被上诉人")
-//    private String dataStatus;
+    private String appellee;
+
+    @Schema(description = "涉案金额")
+    private String involvedAmount;
+
+    @Schema(description = "数据状态")
+    private String dataStatus;
 
     @Schema(description = "企业ID")
     private Integer companyId;

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;
 

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

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;
 

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;
 

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;
 

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;
 

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;