From 12877c7b8e4efe0a8b6f19bdbe1786c04b54d711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Tue, 3 Mar 2026 16:09:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(data-import):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=85=A5=E4=B8=AD=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=92=8C=E6=A0=87=E6=B3=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正CreditGqdjController中历史数据标记字段从dataStatus改为dataType - 修正CreditGqdjImportParam中Excel字段标注将"类型"改为"数据状态" - 为CreditNearbyCompanyImportParam添加邮政编码字段postalCode - 在CreditNearbyCompanyController中增加邮政编码字段设置逻辑 - 为CreditXgxfImportParam添加ExcelHeaderAlias注解支持多字段别名映射 --- .../gxwebsoft/credit/controller/CreditGqdjController.java | 4 ++-- .../credit/controller/CreditNearbyCompanyController.java | 1 + .../com/gxwebsoft/credit/param/CreditGqdjImportParam.java | 5 +++-- .../credit/param/CreditNearbyCompanyImportParam.java | 3 +++ .../com/gxwebsoft/credit/param/CreditXgxfImportParam.java | 2 ++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java index 691bf87..ef168aa 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java @@ -539,7 +539,7 @@ public class CreditGqdjController extends BaseController { item.setDeleted(0); } // 历史导入的数据统一标记为“失效” - item.setDataStatus("失效"); + item.setDataType("失效"); if (item.getRecommend() == null) { item.setRecommend(0); @@ -667,7 +667,7 @@ public class CreditGqdjController extends BaseController { } else { entity.setDataStatus(param.getDataStatus()); } - entity.setDataType("股权冻结"); + entity.setDataType(param.getDataType()); entity.setPublicDate(param.getPublicDate()); if (!ImportHelper.isBlank(param.getFreezeDateStart2())) { entity.setFreezeDateStart(param.getFreezeDateStart2()); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java index ff0a427..a3a8a06 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java @@ -443,6 +443,7 @@ public class CreditNearbyCompanyController extends BaseController { entity.setMailingAddress(param.getMailingAddress()); entity.setMailingEmail(param.getMailingEmail()); entity.setTel(param.getTel()); + entity.setPostalCode(param.getPostalCode()); entity.setNationalStandardIndustryCategories5(param.getNationalStandardIndustryCategories5()); entity.setNationalStandardIndustryCategories6(param.getNationalStandardIndustryCategories6()); entity.setNationalStandardIndustryCategories7(param.getNationalStandardIndustryCategories7()); diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditGqdjImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditGqdjImportParam.java index 60e0c9a..7d3168e 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditGqdjImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditGqdjImportParam.java @@ -1,6 +1,7 @@ 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; @@ -40,14 +41,14 @@ public class CreditGqdjImportParam implements Serializable { @Excel(name = "执行法院") private String courtName; - @Excel(name = "类型") + @Excel(name = "数据状态") private String dataType; @Excel(name = "状态") private String dataStatus; // Some upstream sources use "数据状态" as the status column. - @Excel(name = "数据状态") + @Excel(name = "数据状态2") private String dataStatus2; @Excel(name = "冻结日期自") diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java index 7165259..5256eb8 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java @@ -97,6 +97,9 @@ public class CreditNearbyCompanyImportParam implements Serializable { @Schema(name = "通信地址邮箱") private String mailingEmail; + @Schema(name = "注册地址邮编") + private String postalCode; + @Schema(name = "电话") private String tel; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditXgxfImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditXgxfImportParam.java index b458d15..f47e017 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditXgxfImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditXgxfImportParam.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; @@ -23,6 +24,7 @@ public class CreditXgxfImportParam implements Serializable { private String dataType; @Excel(name = "原告/上诉人") + @ExcelHeaderAlias({"申请人"}) private String plaintiffAppellant; // Some upstream multi-company exports use "申请执行人" instead of "原告/上诉人".