feat(credit): 增加企查查历史被执行人数据导入兼容性
- 添加涉案金额字段用于匹配企查查表头 - 新增执行标的金额兼容字段involvedAmountQcc - 新增执行法院兼容字段courtNameQcc - 实现金额和法院名称的多源数据映射逻辑 - 添加公司ID追踪功能用于数据关联 - 优化导入时的空值检查和数据清理
This commit is contained in:
@@ -315,7 +315,9 @@ public class CreditJudgmentDebtorController extends BaseController {
|
|||||||
|| isHeaderValue(param.getCode(), "证件号/组织机构代码")
|
|| isHeaderValue(param.getCode(), "证件号/组织机构代码")
|
||||||
|| isHeaderValue(param.getOccurrenceTime(), "立案日期")
|
|| isHeaderValue(param.getOccurrenceTime(), "立案日期")
|
||||||
|| isHeaderValue(param.getCourtName(), "法院")
|
|| isHeaderValue(param.getCourtName(), "法院")
|
||||||
|| isHeaderValue(param.getInvolvedAmount(), "执行标的(元)")
|
|| isHeaderValue(param.getCourtNameQcc(), "执行法院")
|
||||||
|
|| isHeaderValue(param.getInvolvedAmount(), "涉案金额")
|
||||||
|
|| isHeaderValue(param.getInvolvedAmountQcc(), "执行标的(元)")
|
||||||
|| isHeaderValue(param.getDataStatus(), "数据状态");
|
|| isHeaderValue(param.getDataStatus(), "数据状态");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -360,8 +362,22 @@ public class CreditJudgmentDebtorController extends BaseController {
|
|||||||
? param.getOccurrenceTime2().trim()
|
? param.getOccurrenceTime2().trim()
|
||||||
: (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null);
|
: (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null);
|
||||||
entity.setOccurrenceTime(occurrenceTime);
|
entity.setOccurrenceTime(occurrenceTime);
|
||||||
entity.setAmount(param.getInvolvedAmount());
|
// 兼容企查查历史被执行人:执行标的(元) / 执行法院
|
||||||
entity.setCourtName(param.getCourtName());
|
String amount = !ImportHelper.isBlank(param.getInvolvedAmount())
|
||||||
|
? param.getInvolvedAmount()
|
||||||
|
: param.getInvolvedAmountQcc();
|
||||||
|
if (amount != null) {
|
||||||
|
amount = amount.trim();
|
||||||
|
}
|
||||||
|
entity.setAmount(amount);
|
||||||
|
|
||||||
|
String courtName = !ImportHelper.isBlank(param.getCourtName())
|
||||||
|
? param.getCourtName()
|
||||||
|
: param.getCourtNameQcc();
|
||||||
|
if (courtName != null) {
|
||||||
|
courtName = courtName.trim();
|
||||||
|
}
|
||||||
|
entity.setCourtName(courtName);
|
||||||
entity.setDataStatus(param.getDataStatus());
|
entity.setDataStatus(param.getDataStatus());
|
||||||
entity.setComments(param.getComments());
|
entity.setComments(param.getComments());
|
||||||
|
|
||||||
@@ -539,6 +555,9 @@ public class CreditJudgmentDebtorController extends BaseController {
|
|||||||
if (item.getCompanyId() == null && companyId != null) {
|
if (item.getCompanyId() == null && companyId != null) {
|
||||||
item.setCompanyId(companyId);
|
item.setCompanyId(companyId);
|
||||||
}
|
}
|
||||||
|
if (item.getCompanyId() != null && item.getCompanyId() > 0) {
|
||||||
|
touchedCompanyIds.add(item.getCompanyId());
|
||||||
|
}
|
||||||
if (item.getUserId() == null && currentUserId != null) {
|
if (item.getUserId() == null && currentUserId != null) {
|
||||||
item.setUserId(currentUserId);
|
item.setUserId(currentUserId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,9 +41,22 @@ public class CreditJudgmentDebtorImportParam implements Serializable {
|
|||||||
@Excel(name = "涉案金额")
|
@Excel(name = "涉案金额")
|
||||||
private String involvedAmount;
|
private String involvedAmount;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 兼容企查查“历史被执行人”表头:执行标的(元)
|
||||||
|
* 注意:模板导出仍以标准字段为主,这里仅用于增强导入兼容性。
|
||||||
|
*/
|
||||||
|
@Excel(name = "执行标的(元)")
|
||||||
|
private String involvedAmountQcc;
|
||||||
|
|
||||||
@Excel(name = "法院")
|
@Excel(name = "法院")
|
||||||
private String courtName;
|
private String courtName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 兼容企查查“历史被执行人”表头:执行法院
|
||||||
|
*/
|
||||||
|
@Excel(name = "执行法院")
|
||||||
|
private String courtNameQcc;
|
||||||
|
|
||||||
@Excel(name = "数据状态")
|
@Excel(name = "数据状态")
|
||||||
private String dataStatus;
|
private String dataStatus;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user