1
This commit is contained in:
@@ -328,10 +328,30 @@ public class CreditJudgmentDebtorController extends BaseController {
|
||||
entity.setCaseNumber(param.getCaseNumber());
|
||||
entity.setName1(param.getName1());
|
||||
String debtorName = ImportHelper.isBlank(param.getName()) ? param.getName1() : param.getName();
|
||||
if (debtorName != null) {
|
||||
debtorName = debtorName.trim();
|
||||
}
|
||||
// Some upstream XLS templates store party/company name in "原告/上诉人/被告/第三人" columns.
|
||||
// When present, use them to populate the debtor "name" for compatibility.
|
||||
if (!ImportHelper.isBlank(param.getPlaintiffAppellant())) {
|
||||
debtorName = param.getPlaintiffAppellant().trim();
|
||||
}
|
||||
if (!ImportHelper.isBlank(param.getAppellee())) {
|
||||
debtorName = param.getAppellee().trim();
|
||||
}
|
||||
if (!ImportHelper.isBlank(param.getOtherPartiesThirdParty())) {
|
||||
debtorName = param.getOtherPartiesThirdParty().trim();
|
||||
}
|
||||
entity.setName(debtorName);
|
||||
entity.setCode(param.getCode());
|
||||
entity.setOccurrenceTime(param.getOccurrenceTime());
|
||||
entity.setAmount(param.getAmount());
|
||||
String occurrenceTime = !ImportHelper.isBlank(param.getOccurrenceTime2())
|
||||
? param.getOccurrenceTime2().trim()
|
||||
: (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null);
|
||||
entity.setOccurrenceTime(occurrenceTime);
|
||||
String amount = !ImportHelper.isBlank(param.getInvolvedAmount2())
|
||||
? param.getInvolvedAmount2().trim()
|
||||
: (param.getAmount() != null ? param.getAmount().trim() : null);
|
||||
entity.setAmount(amount);
|
||||
entity.setCourtName(param.getCourtName());
|
||||
entity.setDataStatus(param.getDataStatus());
|
||||
entity.setComments(param.getComments());
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.gxwebsoft.credit.param;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -38,4 +39,21 @@ public class CreditJudgmentDebtorImportParam implements Serializable {
|
||||
|
||||
@Excel(name = "备注")
|
||||
private String comments;
|
||||
|
||||
@Excel(name = "原告/上诉人")
|
||||
private String plaintiffAppellant;
|
||||
|
||||
@Excel(name = "被告/被上诉人")
|
||||
private String appellee;
|
||||
|
||||
@Excel(name = "其他当事人/第三人")
|
||||
private String otherPartiesThirdParty;
|
||||
|
||||
@Schema(description = "发生时间")
|
||||
@Excel(name = "发生时间")
|
||||
private String occurrenceTime2;
|
||||
|
||||
@Schema(description = "涉案金额")
|
||||
@Excel(name = "涉案金额")
|
||||
private String involvedAmount2;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user