From 83cb7208a88d18e176859fa04843f58245fa1d0a Mon Sep 17 00:00:00 2001 From: gxwebsoft <170083662@qq.com> Date: Fri, 6 Feb 2026 16:42:00 +0800 Subject: [PATCH] =?UTF-8?q?refactor(credit):=20=E9=87=8D=E6=9E=84=E4=BF=A1?= =?UTF-8?q?=E7=94=A8=E7=B3=BB=E7=BB=9F=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将plaintiffUser和defendantUser字段替换为plaintiffAppellant和appellee - 移除冗余的*2字段(如involvedAmount2、occurrenceTime2、courtName2) - 统一使用标准字段进行数据映射避免重复逻辑 - 更新Excel注解标签以匹配新的字段命名规范 - 调整数据导入时的字段对应关系 --- .../controller/CreditXgxfController.java | 17 ++++-------- .../credit/param/CreditXgxfImportParam.java | 26 +++++-------------- 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java index 8398f3e..e500952 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java @@ -605,24 +605,17 @@ public class CreditXgxfController extends BaseController { entity.setCaseNumber(param.getCaseNumber()); entity.setType(param.getType()); entity.setDataType(param.getDataType()); - entity.setPlaintiffUser(param.getPlaintiffUser()); - entity.setDefendantUser(param.getDefendantUser()); + entity.setPlaintiffAppellant(param.getPlaintiffAppellant()); + entity.setAppellee(param.getAppellee()); entity.setOtherPartiesThirdParty(param.getOtherPartiesThirdParty()); entity.setPlaintiffAppellant(param.getPlaintiffAppellant()); entity.setDataStatus(param.getDataStatus()); entity.setAppellee(param.getAppellee()); // 兼容不同模板字段：如果 *2 有值则以 *2 为准写入主字段 - 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.setInvolvedAmount(param.getInvolvedAmount()); + entity.setOccurrenceTime(param.getOccurrenceTime()); + entity.setCourtName(param.getCourtName()); entity.setReleaseDate(param.getReleaseDate()); entity.setComments(param.getComments()); diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditXgxfImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditXgxfImportParam.java index d0eb97d..37c3e94 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditXgxfImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditXgxfImportParam.java @@ -22,25 +22,22 @@ public class CreditXgxfImportParam implements Serializable { @Excel(name = "限消令对象") private String dataType; - @Excel(name = "限制法定代表人") + @Schema(description = "原告/上诉人") private String plaintiffAppellant; - @Excel(name = "申请人") + @Schema(description = "被告/被上诉人") private String appellee; - @Excel(name = "涉案金额(元)") - private String involvedAmount; + @Schema(description = "其他当事人/第三人") + private String otherPartiesThirdParty; @Excel(name = "涉案金额") - private String involvedAmount2; - - @Excel(name = "立案日期") - private String occurrenceTime; + private String involvedAmount; @Excel(name = "发生时间") - private String occurrenceTime2; + private String occurrenceTime; - @Excel(name = "执行法院") + @Excel(name = "法院") private String courtName; @Excel(name = "发布日期") @@ -49,15 +46,6 @@ public class CreditXgxfImportParam implements Serializable { @Excel(name = "备注") private String comments; - @Excel(name = "原告/上诉人") - private String plaintiffUser; - - @Excel(name = "被告/被上诉人") - private String defendantUser; - - @Excel(name = "其他当事人/第三人") - private String otherPartiesThirdParty; - @Excel(name = "数据状态") private String dataStatus;