refactor(credit): 重构信用系统相关实体字段映射
- 将plaintiffUser和defendantUser字段替换为plaintiffAppellant和appellee - 移除冗余的*2字段(如involvedAmount2、occurrenceTime2、courtName2) - 统一使用标准字段进行数据映射避免重复逻辑 - 更新Excel注解标签以匹配新的字段命名规范 - 调整数据导入时的字段对应关系
This commit is contained in:
@@ -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());
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user