fix(excel): 解决Excel导入时字段映射和数据处理问题
- 为CreditCourtAnnouncementImportParam添加ExcelHeaderAlias注解支持多别名映射 - 为CreditJudgmentDebtorImportParam添加ExcelHeaderAlias注解支持多别名映射 - 修复CreditXgxfController中appellee字段取值逻辑,使用正确的数据源 - 统一字段映射规则,确保Excel表头别名能够正确识别
This commit is contained in:
@@ -484,11 +484,12 @@ public class CreditXgxfController extends BaseController {
|
||||
: param.getPlaintiffAppellant2();
|
||||
String appellee = !ImportHelper.isBlank(param.getAppellee())
|
||||
? param.getAppellee()
|
||||
: param.getAppellee2();
|
||||
: param.getDataType();
|
||||
String courtName = !ImportHelper.isBlank(param.getCourtName())
|
||||
? param.getCourtName()
|
||||
: param.getCourtName2();
|
||||
|
||||
|
||||
entity.setCaseNumber(param.getCaseNumber());
|
||||
entity.setType(param.getType());
|
||||
entity.setDataType(param.getDataType());
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.gxwebsoft.credit.param;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import com.gxwebsoft.credit.excel.ExcelHeaderAlias;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -46,6 +47,7 @@ public class CreditCourtAnnouncementImportParam implements Serializable {
|
||||
private String involvedAmount2;
|
||||
|
||||
@Excel(name = "法院")
|
||||
@ExcelHeaderAlias({"公告人","执行法院"})
|
||||
private String courtName;
|
||||
|
||||
@Excel(name = "数据状态")
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -26,6 +27,7 @@ public class CreditJudgmentDebtorImportParam implements Serializable {
|
||||
private String plaintiffAppellant;
|
||||
|
||||
@Excel(name = "被告/被上诉人")
|
||||
@ExcelHeaderAlias({"被执行人名称"})
|
||||
private String appellee;
|
||||
|
||||
@Excel(name = "其他当事人/第三人")
|
||||
|
||||
Reference in New Issue
Block a user