From 5a95375cda15c86923fa3353be620148a898cfea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Wed, 28 Jan 2026 16:05:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(settlement):=20=E6=9B=B4=E6=96=B0=E5=88=86?= =?UTF-8?q?=E9=94=80=E7=BB=93=E7=AE=97=E9=80=BB=E8=BE=91=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E9=87=91=E9=A2=9D=E5=92=8C=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94=E4=B8=A4=E7=A7=8D=E4=BD=A3=E9=87=91=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 替换 CommissionRateConfig 为 CommissionConfig，支持 commissionType 字段区分固定金额和百分比模式 - 新增 calcMoneyByCommissionType 方法，根据 commissionType 计算佣金金额 - 修改 findOrderSingleGoods 为 findOrderSingleGoodsInfo，返回商品信息和数量 - 更新日志输出格式，显示商品数量和佣金类型信息 - 调整信用分销商佣金方法参数，传递商品数量和佣金配置对象 - 新增 OrderGoodsInfo 和 CommissionConfig 内部类定义 - 实现固定金额模式按件计算佣金的逻辑 - 添加安全数值处理方法 safeValue 和 safePositive - 更新佣金注释构建方法，显示佣金类型和具体数值信息 --- .../credit/controller/BatchImportSupport.java | 10 +++++++++- .../CreditAdministrativeLicenseController.java | 2 ++ .../credit/controller/CreditBankruptcyController.java | 2 ++ .../credit/controller/CreditBranchController.java | 2 ++ .../controller/CreditBreachOfTrustController.java | 2 ++ .../credit/controller/CreditCaseFilingController.java | 2 ++ .../credit/controller/CreditCompetitorController.java | 2 ++ .../controller/CreditCourtAnnouncementController.java | 2 ++ .../controller/CreditCourtSessionController.java | 2 ++ .../credit/controller/CreditCustomerController.java | 2 ++ .../controller/CreditDeliveryNoticeController.java | 2 ++ .../credit/controller/CreditExternalController.java | 2 ++ .../controller/CreditFinalVersionController.java | 2 ++ .../credit/controller/CreditGqdjController.java | 2 ++ .../CreditHistoricalLegalPersonController.java | 2 ++ .../controller/CreditJudgmentDebtorController.java | 2 ++ .../controller/CreditJudicialDocumentController.java | 2 ++ .../credit/controller/CreditJudiciaryController.java | 2 ++ .../credit/controller/CreditMediationController.java | 2 ++ .../controller/CreditNearbyCompanyController.java | 2 ++ .../credit/controller/CreditPatentController.java | 2 ++ .../controller/CreditRiskRelationController.java | 2 ++ .../credit/controller/CreditSupplierController.java | 2 ++ .../CreditSuspectedRelationshipController.java | 2 ++ .../credit/controller/CreditUserController.java | 2 ++ .../credit/controller/CreditXgxfController.java | 2 ++ .../credit/entity/CreditAdministrativeLicense.java | 3 +++ .../com/gxwebsoft/credit/entity/CreditBankruptcy.java | 3 +++ .../java/com/gxwebsoft/credit/entity/CreditBranch.java | 3 +++ .../gxwebsoft/credit/entity/CreditBreachOfTrust.java | 3 +++ .../com/gxwebsoft/credit/entity/CreditCaseFiling.java | 3 +++ .../com/gxwebsoft/credit/entity/CreditCompetitor.java | 3 +++ .../credit/entity/CreditCourtAnnouncement.java | 3 +++ .../gxwebsoft/credit/entity/CreditCourtSession.java | 3 +++ .../com/gxwebsoft/credit/entity/CreditCustomer.java | 3 +++ .../gxwebsoft/credit/entity/CreditDeliveryNotice.java | 3 +++ .../com/gxwebsoft/credit/entity/CreditExternal.java | 3 +++ .../gxwebsoft/credit/entity/CreditFinalVersion.java | 3 +++ .../java/com/gxwebsoft/credit/entity/CreditGqdj.java | 3 +++ .../credit/entity/CreditHistoricalLegalPerson.java | 3 +++ .../gxwebsoft/credit/entity/CreditJudgmentDebtor.java | 3 +++ .../credit/entity/CreditJudicialDocument.java | 3 +++ .../com/gxwebsoft/credit/entity/CreditJudiciary.java | 3 +++ .../com/gxwebsoft/credit/entity/CreditMediation.java | 3 +++ .../gxwebsoft/credit/entity/CreditNearbyCompany.java | 3 +++ .../java/com/gxwebsoft/credit/entity/CreditPatent.java | 3 +++ .../gxwebsoft/credit/entity/CreditRiskRelation.java | 3 +++ .../com/gxwebsoft/credit/entity/CreditSupplier.java | 3 +++ .../credit/entity/CreditSuspectedRelationship.java | 3 +++ .../java/com/gxwebsoft/credit/entity/CreditUser.java | 3 +++ .../java/com/gxwebsoft/credit/entity/CreditXgxf.java | 3 +++ 51 files changed, 134 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gxwebsoft/credit/controller/BatchImportSupport.java b/src/main/java/com/gxwebsoft/credit/controller/BatchImportSupport.java index 6717692..ea2d2ec 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/BatchImportSupport.java +++ b/src/main/java/com/gxwebsoft/credit/controller/BatchImportSupport.java @@ -86,13 +86,15 @@ public class BatchImportSupport { SFunction nameGetter, SFunction companyIdGetter, BiConsumer companyIdSetter, + SFunction hasDataGetter, + BiConsumer hasDataSetter, SFunction tenantIdGetter, Supplier patchFactory) { boolean onlyNullFlag = (onlyNull == null) || Boolean.TRUE.equals(onlyNull); // 1) 读取待处理数据（仅取必要字段，避免一次性拉全表字段） var query = service.lambdaQuery() - .select(idGetter, nameGetter, companyIdGetter, tenantIdGetter) + .select(idGetter, nameGetter, companyIdGetter, hasDataGetter, tenantIdGetter) .eq(currentTenantId != null, tenantIdGetter, currentTenantId) .isNotNull(nameGetter); if (onlyNullFlag) { @@ -191,12 +193,17 @@ public class BatchImportSupport { matched++; Integer oldCompanyId = row != null ? companyIdGetter.apply(row) : null; + Boolean oldHasData = row != null ? hasDataGetter.apply(row) : null; boolean needUpdate; if (onlyNullFlag) { needUpdate = oldCompanyId != null && oldCompanyId == 0; } else { needUpdate = oldCompanyId == null || !companyId.equals(oldCompanyId); } + // 若已匹配到企业，但 hasData 未标记，则也需要回填 hasData=1 + if (!Boolean.TRUE.equals(oldHasData)) { + needUpdate = true; + } if (!needUpdate) { continue; } @@ -208,6 +215,7 @@ public class BatchImportSupport { T patch = patchFactory.get(); idSetter.accept(patch, id); companyIdSetter.accept(patch, companyId); + hasDataSetter.accept(patch, Boolean.TRUE); updates.add(patch); if (updates.size() >= batchSize) { List batch = new ArrayList<>(updates); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditAdministrativeLicenseController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditAdministrativeLicenseController.java index 336ae0a..1310579 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditAdministrativeLicenseController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditAdministrativeLicenseController.java @@ -165,6 +165,8 @@ public class CreditAdministrativeLicenseController extends BaseController { CreditAdministrativeLicense::getName, CreditAdministrativeLicense::getCompanyId, CreditAdministrativeLicense::setCompanyId, + CreditAdministrativeLicense::getHasData, + CreditAdministrativeLicense::setHasData, CreditAdministrativeLicense::getTenantId, CreditAdministrativeLicense::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditBankruptcyController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditBankruptcyController.java index 877fb6a..76be428 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditBankruptcyController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditBankruptcyController.java @@ -165,6 +165,8 @@ public class CreditBankruptcyController extends BaseController { CreditBankruptcy::getParty, CreditBankruptcy::getCompanyId, CreditBankruptcy::setCompanyId, + CreditBankruptcy::getHasData, + CreditBankruptcy::setHasData, CreditBankruptcy::getTenantId, CreditBankruptcy::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditBranchController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditBranchController.java index d1e5011..dae474f 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditBranchController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditBranchController.java @@ -164,6 +164,8 @@ public class CreditBranchController extends BaseController { CreditBranch::getName, CreditBranch::getCompanyId, CreditBranch::setCompanyId, + CreditBranch::getHasData, + CreditBranch::setHasData, CreditBranch::getTenantId, CreditBranch::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java index 0d70ecf..1ad768c 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java @@ -161,6 +161,8 @@ public class CreditBreachOfTrustController extends BaseController { CreditBreachOfTrust::getPlaintiffAppellant, CreditBreachOfTrust::getCompanyId, CreditBreachOfTrust::setCompanyId, + CreditBreachOfTrust::getHasData, + CreditBreachOfTrust::setHasData, CreditBreachOfTrust::getTenantId, CreditBreachOfTrust::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java index e7b8c8d..fd2b497 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java @@ -164,6 +164,8 @@ public class CreditCaseFilingController extends BaseController { CreditCaseFiling::getAppellee, CreditCaseFiling::getCompanyId, CreditCaseFiling::setCompanyId, + CreditCaseFiling::getHasData, + CreditCaseFiling::setHasData, CreditCaseFiling::getTenantId, CreditCaseFiling::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCompetitorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCompetitorController.java index aedeb3c..4c9f00e 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCompetitorController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCompetitorController.java @@ -164,6 +164,8 @@ public class CreditCompetitorController extends BaseController { CreditCompetitor::getName, CreditCompetitor::getCompanyId, CreditCompetitor::setCompanyId, + CreditCompetitor::getHasData, + CreditCompetitor::setHasData, CreditCompetitor::getTenantId, CreditCompetitor::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java index bf00b44..cd2720d 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java @@ -164,6 +164,8 @@ public class CreditCourtAnnouncementController extends BaseController { CreditCourtAnnouncement::getAppellee, CreditCourtAnnouncement::getCompanyId, CreditCourtAnnouncement::setCompanyId, + CreditCourtAnnouncement::getHasData, + CreditCourtAnnouncement::setHasData, CreditCourtAnnouncement::getTenantId, CreditCourtAnnouncement::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java index eb7bca2..73d681e 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java @@ -165,6 +165,8 @@ public class CreditCourtSessionController extends BaseController { CreditCourtSession::getAppellee, CreditCourtSession::getCompanyId, CreditCourtSession::setCompanyId, + CreditCourtSession::getHasData, + CreditCourtSession::setHasData, CreditCourtSession::getTenantId, CreditCourtSession::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCustomerController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCustomerController.java index 2afbc07..038f1a2 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCustomerController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCustomerController.java @@ -160,6 +160,8 @@ public class CreditCustomerController extends BaseController { CreditCustomer::getName, CreditCustomer::getCompanyId, CreditCustomer::setCompanyId, + CreditCustomer::getHasData, + CreditCustomer::setHasData, CreditCustomer::getTenantId, CreditCustomer::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java index 8b09154..8f6e4cd 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java @@ -164,6 +164,8 @@ public class CreditDeliveryNoticeController extends BaseController { CreditDeliveryNotice::getOtherPartiesThirdParty, CreditDeliveryNotice::getCompanyId, CreditDeliveryNotice::setCompanyId, + CreditDeliveryNotice::getHasData, + CreditDeliveryNotice::setHasData, CreditDeliveryNotice::getTenantId, CreditDeliveryNotice::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditExternalController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditExternalController.java index 80d0fbf..063c7ef 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditExternalController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditExternalController.java @@ -164,6 +164,8 @@ public class CreditExternalController extends BaseController { CreditExternal::getName, CreditExternal::getCompanyId, CreditExternal::setCompanyId, + CreditExternal::getHasData, + CreditExternal::setHasData, CreditExternal::getTenantId, CreditExternal::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java index b07df8e..291cd02 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java @@ -165,6 +165,8 @@ public class CreditFinalVersionController extends BaseController { CreditFinalVersion::getAppellee, CreditFinalVersion::getCompanyId, CreditFinalVersion::setCompanyId, + CreditFinalVersion::getHasData, + CreditFinalVersion::setHasData, CreditFinalVersion::getTenantId, CreditFinalVersion::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java index 1fa1b6e..cba7583 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java @@ -165,6 +165,8 @@ public class CreditGqdjController extends BaseController { CreditGqdj::getAppellee, CreditGqdj::getCompanyId, CreditGqdj::setCompanyId, + CreditGqdj::getHasData, + CreditGqdj::setHasData, CreditGqdj::getTenantId, CreditGqdj::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditHistoricalLegalPersonController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditHistoricalLegalPersonController.java index 77f0f80..7848655 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditHistoricalLegalPersonController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditHistoricalLegalPersonController.java @@ -164,6 +164,8 @@ public class CreditHistoricalLegalPersonController extends BaseController { CreditHistoricalLegalPerson::getName, CreditHistoricalLegalPerson::getCompanyId, CreditHistoricalLegalPerson::setCompanyId, + CreditHistoricalLegalPerson::getHasData, + CreditHistoricalLegalPerson::setHasData, CreditHistoricalLegalPerson::getTenantId, CreditHistoricalLegalPerson::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java index 93905cb..97e74ae 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java @@ -174,6 +174,8 @@ public class CreditJudgmentDebtorController extends BaseController { CreditJudgmentDebtor::getName, CreditJudgmentDebtor::getCompanyId, CreditJudgmentDebtor::setCompanyId, + CreditJudgmentDebtor::getHasData, + CreditJudgmentDebtor::setHasData, CreditJudgmentDebtor::getTenantId, CreditJudgmentDebtor::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudicialDocumentController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudicialDocumentController.java index f536c33..5f57797 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudicialDocumentController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudicialDocumentController.java @@ -165,6 +165,8 @@ public class CreditJudicialDocumentController extends BaseController { CreditJudicialDocument::getAppellee, CreditJudicialDocument::getCompanyId, CreditJudicialDocument::setCompanyId, + CreditJudicialDocument::getHasData, + CreditJudicialDocument::setHasData, CreditJudicialDocument::getTenantId, CreditJudicialDocument::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudiciaryController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudiciaryController.java index 1f4cbc2..6027393 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudiciaryController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudiciaryController.java @@ -163,6 +163,8 @@ public class CreditJudiciaryController extends BaseController { CreditJudiciary::getName, CreditJudiciary::getCompanyId, CreditJudiciary::setCompanyId, + CreditJudiciary::getHasData, + CreditJudiciary::setHasData, CreditJudiciary::getTenantId, CreditJudiciary::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditMediationController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditMediationController.java index 74c1319..b5088f1 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditMediationController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditMediationController.java @@ -164,6 +164,8 @@ public class CreditMediationController extends BaseController { CreditMediation::getAppellee, CreditMediation::getCompanyId, CreditMediation::setCompanyId, + CreditMediation::getHasData, + CreditMediation::setHasData, CreditMediation::getTenantId, CreditMediation::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java index f49436b..bc2de03 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java @@ -164,6 +164,8 @@ public class CreditNearbyCompanyController extends BaseController { CreditNearbyCompany::getName, CreditNearbyCompany::getCompanyId, CreditNearbyCompany::setCompanyId, + CreditNearbyCompany::getHasData, + CreditNearbyCompany::setHasData, CreditNearbyCompany::getTenantId, CreditNearbyCompany::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditPatentController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditPatentController.java index 4f29559..9494c30 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditPatentController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditPatentController.java @@ -164,6 +164,8 @@ public class CreditPatentController extends BaseController { CreditPatent::getPatentApplicant, CreditPatent::getCompanyId, CreditPatent::setCompanyId, + CreditPatent::getHasData, + CreditPatent::setHasData, CreditPatent::getTenantId, CreditPatent::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditRiskRelationController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditRiskRelationController.java index 17f03f1..45b69c5 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditRiskRelationController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditRiskRelationController.java @@ -164,6 +164,8 @@ public class CreditRiskRelationController extends BaseController { CreditRiskRelation::getMainBodyName, CreditRiskRelation::getCompanyId, CreditRiskRelation::setCompanyId, + CreditRiskRelation::getHasData, + CreditRiskRelation::setHasData, CreditRiskRelation::getTenantId, CreditRiskRelation::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditSupplierController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditSupplierController.java index 674d22f..3382bb7 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditSupplierController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditSupplierController.java @@ -164,6 +164,8 @@ public class CreditSupplierController extends BaseController { CreditSupplier::getSupplier, CreditSupplier::getCompanyId, CreditSupplier::setCompanyId, + CreditSupplier::getHasData, + CreditSupplier::setHasData, CreditSupplier::getTenantId, CreditSupplier::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditSuspectedRelationshipController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditSuspectedRelationshipController.java index 42abbab..675df51 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditSuspectedRelationshipController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditSuspectedRelationshipController.java @@ -164,6 +164,8 @@ public class CreditSuspectedRelationshipController extends BaseController { CreditSuspectedRelationship::getName, CreditSuspectedRelationship::getCompanyId, CreditSuspectedRelationship::setCompanyId, + CreditSuspectedRelationship::getHasData, + CreditSuspectedRelationship::setHasData, CreditSuspectedRelationship::getTenantId, CreditSuspectedRelationship::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java index f85919b..d9208cb 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java @@ -175,6 +175,8 @@ public class CreditUserController extends BaseController { CreditUser::getWinningName, CreditUser::getCompanyId, CreditUser::setCompanyId, + CreditUser::getHasData, + CreditUser::setHasData, CreditUser::getTenantId, CreditUser::new ); diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java index 34c5533..d11c2e9 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java @@ -165,6 +165,8 @@ public class CreditXgxfController extends BaseController { CreditXgxf::getDataType, CreditXgxf::getCompanyId, CreditXgxf::setCompanyId, + CreditXgxf::getHasData, + CreditXgxf::setHasData, CreditXgxf::getTenantId, CreditXgxf::new ); diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java b/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java index a678f69..a520838 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java @@ -59,6 +59,9 @@ public class CreditAdministrativeLicense implements Serializable { @Schema(description = "数据来源单位") private String dataSourceUnit; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditBankruptcy.java b/src/main/java/com/gxwebsoft/credit/entity/CreditBankruptcy.java index 6741676..1b227a7 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditBankruptcy.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditBankruptcy.java @@ -46,6 +46,9 @@ public class CreditBankruptcy implements Serializable { @Schema(description = "公开日期") private String publicDate; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java b/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java index aba42b6..8cf0447 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java @@ -46,6 +46,9 @@ public class CreditBranch implements Serializable { @Schema(description = "状态") private String statusText; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditBreachOfTrust.java b/src/main/java/com/gxwebsoft/credit/entity/CreditBreachOfTrust.java index 7fab26a..befe849 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditBreachOfTrust.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditBreachOfTrust.java @@ -73,6 +73,9 @@ public class CreditBreachOfTrust implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditCaseFiling.java b/src/main/java/com/gxwebsoft/credit/entity/CreditCaseFiling.java index 35735d0..a0c340b 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditCaseFiling.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditCaseFiling.java @@ -70,6 +70,9 @@ public class CreditCaseFiling implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditCompetitor.java b/src/main/java/com/gxwebsoft/credit/entity/CreditCompetitor.java index c65c132..c7a580c 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditCompetitor.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditCompetitor.java @@ -65,6 +65,9 @@ public class CreditCompetitor implements Serializable { @TableField(exist = false) private String mainCompanyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditCourtAnnouncement.java b/src/main/java/com/gxwebsoft/credit/entity/CreditCourtAnnouncement.java index 4aec378..1f42e78 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditCourtAnnouncement.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditCourtAnnouncement.java @@ -70,6 +70,9 @@ public class CreditCourtAnnouncement implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditCourtSession.java b/src/main/java/com/gxwebsoft/credit/entity/CreditCourtSession.java index 4706ca6..0784d41 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditCourtSession.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditCourtSession.java @@ -70,6 +70,9 @@ public class CreditCourtSession implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditCustomer.java b/src/main/java/com/gxwebsoft/credit/entity/CreditCustomer.java index fee36a2..522faa5 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditCustomer.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditCustomer.java @@ -55,6 +55,9 @@ public class CreditCustomer implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditDeliveryNotice.java b/src/main/java/com/gxwebsoft/credit/entity/CreditDeliveryNotice.java index d29c563..e6dab67 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditDeliveryNotice.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditDeliveryNotice.java @@ -71,6 +71,9 @@ public class CreditDeliveryNotice implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditExternal.java b/src/main/java/com/gxwebsoft/credit/entity/CreditExternal.java index 7ee87d3..e95a42f 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditExternal.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditExternal.java @@ -82,6 +82,9 @@ public class CreditExternal implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditFinalVersion.java b/src/main/java/com/gxwebsoft/credit/entity/CreditFinalVersion.java index 3797b12..be09c32 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditFinalVersion.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditFinalVersion.java @@ -64,6 +64,9 @@ public class CreditFinalVersion implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditGqdj.java b/src/main/java/com/gxwebsoft/credit/entity/CreditGqdj.java index cb1907b..13d6da2 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditGqdj.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditGqdj.java @@ -70,6 +70,9 @@ public class CreditGqdj implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java b/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java index 1ea23db..f8557e2 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java @@ -40,6 +40,9 @@ public class CreditHistoricalLegalPerson implements Serializable { @Schema(description = "链接") private String url; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java index 2ee5976..9e1e4fc 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java @@ -65,6 +65,9 @@ public class CreditJudgmentDebtor implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditJudicialDocument.java b/src/main/java/com/gxwebsoft/credit/entity/CreditJudicialDocument.java index df52790..cc0d9ac 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditJudicialDocument.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditJudicialDocument.java @@ -73,6 +73,9 @@ public class CreditJudicialDocument implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditJudiciary.java b/src/main/java/com/gxwebsoft/credit/entity/CreditJudiciary.java index 1a7739a..7fcb938 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditJudiciary.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditJudiciary.java @@ -86,6 +86,9 @@ public class CreditJudiciary implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditMediation.java b/src/main/java/com/gxwebsoft/credit/entity/CreditMediation.java index 71963a0..619dece 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditMediation.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditMediation.java @@ -70,6 +70,9 @@ public class CreditMediation implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java b/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java index c7cd714..6c844eb 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java @@ -194,6 +194,9 @@ public class CreditNearbyCompany implements Serializable { @Schema(description = "是否小微企业") private String smallEnterprise; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditPatent.java b/src/main/java/com/gxwebsoft/credit/entity/CreditPatent.java index 6634e22..a45177b 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditPatent.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditPatent.java @@ -58,6 +58,9 @@ public class CreditPatent implements Serializable { @Schema(description = "链接") private String url; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditRiskRelation.java b/src/main/java/com/gxwebsoft/credit/entity/CreditRiskRelation.java index 762036e..1d75ff2 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditRiskRelation.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditRiskRelation.java @@ -54,6 +54,9 @@ public class CreditRiskRelation implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditSupplier.java b/src/main/java/com/gxwebsoft/credit/entity/CreditSupplier.java index 879b91d..ceb4ff0 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditSupplier.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditSupplier.java @@ -55,6 +55,9 @@ public class CreditSupplier implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java b/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java index f41659b..41898c8 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java @@ -55,6 +55,9 @@ public class CreditSuspectedRelationship implements Serializable { @Schema(description = "链接") private String url; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java b/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java index f1ee7cc..1407eb1 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java @@ -82,6 +82,9 @@ public class CreditUser implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditXgxf.java b/src/main/java/com/gxwebsoft/credit/entity/CreditXgxf.java index 9f8e1c6..4859bd8 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditXgxf.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditXgxf.java @@ -82,6 +82,9 @@ public class CreditXgxf implements Serializable { @TableField(exist = false) private String companyName; + @Schema(description = "是否有数据") + private Boolean hasData; + @Schema(description = "备注") private String comments;