diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java index 5a76726..6ac8405 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java @@ -315,7 +315,9 @@ public class CreditJudgmentDebtorController extends BaseController { || isHeaderValue(param.getCode(), "证件号/组织机构代码") || isHeaderValue(param.getOccurrenceTime(), "立案日期") || isHeaderValue(param.getCourtName(), "法院") - || isHeaderValue(param.getInvolvedAmount(), "执行标的(元)") + || isHeaderValue(param.getCourtNameQcc(), "执行法院") + || isHeaderValue(param.getInvolvedAmount(), "涉案金额") + || isHeaderValue(param.getInvolvedAmountQcc(), "执行标的(元)") || isHeaderValue(param.getDataStatus(), "数据状态"); } @@ -360,8 +362,22 @@ public class CreditJudgmentDebtorController extends BaseController { ? param.getOccurrenceTime2().trim() : (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null); 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.setComments(param.getComments()); @@ -539,6 +555,9 @@ public class CreditJudgmentDebtorController extends BaseController { if (item.getCompanyId() == null && companyId != null) { item.setCompanyId(companyId); } + if (item.getCompanyId() != null && item.getCompanyId() > 0) { + touchedCompanyIds.add(item.getCompanyId()); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java index 3f77aed..6393848 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java @@ -41,9 +41,22 @@ public class CreditJudgmentDebtorImportParam implements Serializable { @Excel(name = "涉案金额") private String involvedAmount; + /** + * 兼容企查查“历史被执行人”表头:执行标的(元) + * 注意:模板导出仍以标准字段为主,这里仅用于增强导入兼容性。 + */ + @Excel(name = "执行标的(元)") + private String involvedAmountQcc; + @Excel(name = "法院") private String courtName; + /** + * 兼容企查查“历史被执行人”表头:执行法院 + */ + @Excel(name = "执行法院") + private String courtNameQcc; + @Excel(name = "数据状态") private String dataStatus;