feat(credit): 优化执行标的字段映射逻辑
- 修改CreditCourtSessionImportParam中occurrenceTime2字段的Excel名称为开庭时间 - 在CreditJudgmentDebtor实体中新增involvedAmountQcc字段用于存储执行标的金额 - 调整CreditJudgmentDebtorController中的执行标的选择逻辑,优先使用企查查字段 - 重新映射CreditJudicialDocumentImportParam中涉案金额字段的Excel注解配置
This commit is contained in:
@@ -368,9 +368,9 @@ public class CreditJudgmentDebtorController extends BaseController {
|
|||||||
: (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null);
|
: (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null);
|
||||||
entity.setOccurrenceTime(occurrenceTime);
|
entity.setOccurrenceTime(occurrenceTime);
|
||||||
// 兼容企查查历史被执行人:执行标的(元) / 执行法院
|
// 兼容企查查历史被执行人:执行标的(元) / 执行法院
|
||||||
String amount = !ImportHelper.isBlank(param.getInvolvedAmount())
|
String amount = !ImportHelper.isBlank(param.getInvolvedAmountQcc())
|
||||||
? param.getInvolvedAmount()
|
? param.getInvolvedAmountQcc()
|
||||||
: param.getInvolvedAmountQcc();
|
: param.getInvolvedAmount();
|
||||||
if (amount != null) {
|
if (amount != null) {
|
||||||
amount = amount.trim();
|
amount = amount.trim();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,9 @@ public class CreditJudgmentDebtor implements Serializable {
|
|||||||
@Schema(description = "涉案金额")
|
@Schema(description = "涉案金额")
|
||||||
private String amount;
|
private String amount;
|
||||||
|
|
||||||
|
@Schema(description = "执行标的(元)")
|
||||||
|
private String involvedAmountQcc;
|
||||||
|
|
||||||
@Schema(description = "法院")
|
@Schema(description = "法院")
|
||||||
private String courtName;
|
private String courtName;
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public class CreditCourtSessionImportParam implements Serializable {
|
|||||||
@Excel(name = "数据状态")
|
@Excel(name = "数据状态")
|
||||||
private String dataStatus;
|
private String dataStatus;
|
||||||
|
|
||||||
@Excel(name = "发生时间")
|
@Excel(name = "开庭时间")
|
||||||
private String occurrenceTime2;
|
private String occurrenceTime2;
|
||||||
|
|
||||||
@Excel(name = "涉案金额(元)")
|
@Excel(name = "涉案金额(元)")
|
||||||
|
|||||||
@@ -28,10 +28,10 @@ public class CreditJudicialDocumentImportParam implements Serializable {
|
|||||||
@Excel(name = "当事人")
|
@Excel(name = "当事人")
|
||||||
private String otherPartiesThirdParty;
|
private String otherPartiesThirdParty;
|
||||||
|
|
||||||
@Excel(name = "案件金额(元)")
|
@Excel(name = "涉案金额")
|
||||||
private String involvedAmount;
|
private String involvedAmount;
|
||||||
|
|
||||||
@Excel(name = "涉案金额")
|
@Excel(name = "案件金额(元)")
|
||||||
private String involvedAmount2;
|
private String involvedAmount2;
|
||||||
|
|
||||||
@Excel(name = "裁判结果")
|
@Excel(name = "裁判结果")
|
||||||
|
|||||||
Reference in New Issue
Block a user