fix(data-import): 修复数据导入中的字段映射和标注问题
- 修正CreditGqdjController中历史数据标记字段从dataStatus改为dataType - 修正CreditGqdjImportParam中Excel字段标注将"类型"改为"数据状态" - 为CreditNearbyCompanyImportParam添加邮政编码字段postalCode - 在CreditNearbyCompanyController中增加邮政编码字段设置逻辑 - 为CreditXgxfImportParam添加ExcelHeaderAlias注解支持多字段别名映射
This commit is contained in:
@@ -539,7 +539,7 @@ public class CreditGqdjController extends BaseController {
|
|||||||
item.setDeleted(0);
|
item.setDeleted(0);
|
||||||
}
|
}
|
||||||
// 历史导入的数据统一标记为“失效”
|
// 历史导入的数据统一标记为“失效”
|
||||||
item.setDataStatus("失效");
|
item.setDataType("失效");
|
||||||
|
|
||||||
if (item.getRecommend() == null) {
|
if (item.getRecommend() == null) {
|
||||||
item.setRecommend(0);
|
item.setRecommend(0);
|
||||||
@@ -667,7 +667,7 @@ public class CreditGqdjController extends BaseController {
|
|||||||
} else {
|
} else {
|
||||||
entity.setDataStatus(param.getDataStatus());
|
entity.setDataStatus(param.getDataStatus());
|
||||||
}
|
}
|
||||||
entity.setDataType("股权冻结");
|
entity.setDataType(param.getDataType());
|
||||||
entity.setPublicDate(param.getPublicDate());
|
entity.setPublicDate(param.getPublicDate());
|
||||||
if (!ImportHelper.isBlank(param.getFreezeDateStart2())) {
|
if (!ImportHelper.isBlank(param.getFreezeDateStart2())) {
|
||||||
entity.setFreezeDateStart(param.getFreezeDateStart2());
|
entity.setFreezeDateStart(param.getFreezeDateStart2());
|
||||||
|
|||||||
@@ -443,6 +443,7 @@ public class CreditNearbyCompanyController extends BaseController {
|
|||||||
entity.setMailingAddress(param.getMailingAddress());
|
entity.setMailingAddress(param.getMailingAddress());
|
||||||
entity.setMailingEmail(param.getMailingEmail());
|
entity.setMailingEmail(param.getMailingEmail());
|
||||||
entity.setTel(param.getTel());
|
entity.setTel(param.getTel());
|
||||||
|
entity.setPostalCode(param.getPostalCode());
|
||||||
entity.setNationalStandardIndustryCategories5(param.getNationalStandardIndustryCategories5());
|
entity.setNationalStandardIndustryCategories5(param.getNationalStandardIndustryCategories5());
|
||||||
entity.setNationalStandardIndustryCategories6(param.getNationalStandardIndustryCategories6());
|
entity.setNationalStandardIndustryCategories6(param.getNationalStandardIndustryCategories6());
|
||||||
entity.setNationalStandardIndustryCategories7(param.getNationalStandardIndustryCategories7());
|
entity.setNationalStandardIndustryCategories7(param.getNationalStandardIndustryCategories7());
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.gxwebsoft.credit.param;
|
package com.gxwebsoft.credit.param;
|
||||||
|
|
||||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -40,14 +41,14 @@ public class CreditGqdjImportParam implements Serializable {
|
|||||||
@Excel(name = "执行法院")
|
@Excel(name = "执行法院")
|
||||||
private String courtName;
|
private String courtName;
|
||||||
|
|
||||||
@Excel(name = "类型")
|
@Excel(name = "数据状态")
|
||||||
private String dataType;
|
private String dataType;
|
||||||
|
|
||||||
@Excel(name = "状态")
|
@Excel(name = "状态")
|
||||||
private String dataStatus;
|
private String dataStatus;
|
||||||
|
|
||||||
// Some upstream sources use "数据状态" as the status column.
|
// Some upstream sources use "数据状态" as the status column.
|
||||||
@Excel(name = "数据状态")
|
@Excel(name = "数据状态2")
|
||||||
private String dataStatus2;
|
private String dataStatus2;
|
||||||
|
|
||||||
@Excel(name = "冻结日期自")
|
@Excel(name = "冻结日期自")
|
||||||
|
|||||||
@@ -97,6 +97,9 @@ public class CreditNearbyCompanyImportParam implements Serializable {
|
|||||||
@Schema(name = "通信地址邮箱")
|
@Schema(name = "通信地址邮箱")
|
||||||
private String mailingEmail;
|
private String mailingEmail;
|
||||||
|
|
||||||
|
@Schema(name = "注册地址邮编")
|
||||||
|
private String postalCode;
|
||||||
|
|
||||||
@Schema(name = "电话")
|
@Schema(name = "电话")
|
||||||
private String tel;
|
private String tel;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.gxwebsoft.credit.param;
|
package com.gxwebsoft.credit.param;
|
||||||
|
|
||||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||||
|
import com.gxwebsoft.credit.excel.ExcelHeaderAlias;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -23,6 +24,7 @@ public class CreditXgxfImportParam implements Serializable {
|
|||||||
private String dataType;
|
private String dataType;
|
||||||
|
|
||||||
@Excel(name = "原告/上诉人")
|
@Excel(name = "原告/上诉人")
|
||||||
|
@ExcelHeaderAlias({"申请人"})
|
||||||
private String plaintiffAppellant;
|
private String plaintiffAppellant;
|
||||||
|
|
||||||
// Some upstream multi-company exports use "申请执行人" instead of "原告/上诉人".
|
// Some upstream multi-company exports use "申请执行人" instead of "原告/上诉人".
|
||||||
|
|||||||
Reference in New Issue
Block a user