diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml index 06b34f9..460014e 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml @@ -74,7 +74,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBankruptcyMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBankruptcyMapper.xml index 1b7ff9a..4d87283 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBankruptcyMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBankruptcyMapper.xml @@ -62,7 +62,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml index e263bda..5cff6b6 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml @@ -62,7 +62,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBreachOfTrustMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBreachOfTrustMapper.xml index cd222e5..5f1205e 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBreachOfTrustMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBreachOfTrustMapper.xml @@ -62,7 +62,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCaseFilingMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCaseFilingMapper.xml index 6ed7eec..bedf51b 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCaseFilingMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCaseFilingMapper.xml @@ -74,7 +74,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCompetitorMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCompetitorMapper.xml index 2714d39..bbe653f 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCompetitorMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCompetitorMapper.xml @@ -65,8 +65,8 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR a.name = #{param.keywords} - OR b.name = #{param.keywords} + OR a.name LIKE CONCAT('%', #{param.keywords}, '%') + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCourtAnnouncementMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCourtAnnouncementMapper.xml index 618a725..fcf4bf9 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCourtAnnouncementMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCourtAnnouncementMapper.xml @@ -74,7 +74,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCourtSessionMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCourtSessionMapper.xml index 5e5669e..dbaaa24 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCourtSessionMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCourtSessionMapper.xml @@ -74,7 +74,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCustomerMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCustomerMapper.xml index ea7e284..fb1f439 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCustomerMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCustomerMapper.xml @@ -59,7 +59,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditDeliveryNoticeMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditDeliveryNoticeMapper.xml index 256cd0c..2163056 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditDeliveryNoticeMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditDeliveryNoticeMapper.xml @@ -59,7 +59,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditExternalMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditExternalMapper.xml index d022413..9c0ac75 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditExternalMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditExternalMapper.xml @@ -86,7 +86,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditFinalVersionMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditFinalVersionMapper.xml index ce9df51..3dcd2da 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditFinalVersionMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditFinalVersionMapper.xml @@ -62,7 +62,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditGqdjMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditGqdjMapper.xml index 6e13551..c276e6a 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditGqdjMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditGqdjMapper.xml @@ -65,7 +65,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml index bc5113f..0b700cb 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml @@ -56,7 +56,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudgmentDebtorMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudgmentDebtorMapper.xml index fbf9ca3..3eb5d06 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudgmentDebtorMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudgmentDebtorMapper.xml @@ -66,7 +66,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') OR a.case_number = #{param.keywords} - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudicialDocumentMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudicialDocumentMapper.xml index e7a57bd..e7adaf5 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudicialDocumentMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudicialDocumentMapper.xml @@ -62,7 +62,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudiciaryMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudiciaryMapper.xml index f6348ed..e08e451 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudiciaryMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditJudiciaryMapper.xml @@ -95,7 +95,7 @@ AND (a.name LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditMediationMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditMediationMapper.xml index 002d107..71661ee 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditMediationMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditMediationMapper.xml @@ -74,7 +74,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml index b338412..d8f9327 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml @@ -204,7 +204,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') OR a.name = #{param.keywords} - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditPatentMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditPatentMapper.xml index 245e362..dc9b6f4 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditPatentMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditPatentMapper.xml @@ -74,7 +74,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditRiskRelationMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditRiskRelationMapper.xml index 0b3c5a3..9683d91 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditRiskRelationMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditRiskRelationMapper.xml @@ -63,7 +63,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') OR b.name = #{param.keywords} - OR a.main_bodyName = #{param.keywords} + OR b.main_body_name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSupplierMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSupplierMapper.xml index 61fd12e..c5d3cdd 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSupplierMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSupplierMapper.xml @@ -59,7 +59,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml index 43e841a..7f3a3f7 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml @@ -71,7 +71,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditUserMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditUserMapper.xml index b7d4114..ad06b5a 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditUserMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditUserMapper.xml @@ -91,7 +91,7 @@ AND (a.name LIKE CONCAT('%', #{param.keywords}, '%') OR a.procurement_name LIKE CONCAT('%', #{param.keywords}, '%') OR a.winning_name LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditXgxfMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditXgxfMapper.xml index c233a23..cc37783 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditXgxfMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditXgxfMapper.xml @@ -74,7 +74,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR b.name = #{param.keywords} + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java index 4404596..1148f57 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java @@ -182,7 +182,7 @@ public class ShopDealerApplyController extends BaseController { /** * excel批量导入分销商申请记录 - * Excel表头格式:类型、用户ID、姓名、分销商名称、分销商编码、手机号、合同金额、详细地址、推荐人用户ID、申请方式、审核状态、合同时间、驳回原因、商城ID + * Excel表头格式:类型、用户ID、姓名、分销商名称、分销商编码、手机号、合同金额、详细地址、社区、楼栋号、单元号、房号、推荐人用户ID、申请方式、审核状态、合同时间、驳回原因、商城ID */ @PreAuthorize("hasAuthority('shop:shopDealerApply:save')") @Transactional(rollbackFor = {Exception.class}) @@ -295,6 +295,10 @@ public class ShopDealerApplyController extends BaseController { example.setApplyType(10); example.setApplyStatus(10); example.setContractTime("2025-09-05 10:00:00"); + example.setCommunity("xx社区"); + example.setBuildingNumber("1"); + example.setUnitNumber("2"); + example.setRoomNumber("302"); templateList.add(example); // 设置导出参数 @@ -327,6 +331,10 @@ public class ShopDealerApplyController extends BaseController { entity.setMobile(param.getMobile()); entity.setMoney(param.getMoney()); entity.setAddress(param.getAddress()); + entity.setCommunity(param.getCommunity()); + entity.setBuildingNumber(param.getBuildingNumber()); + entity.setUnitNumber(param.getUnitNumber()); + entity.setRoomNumber(param.getRoomNumber()); entity.setRefereeId(param.getRefereeId()); entity.setApplyType(param.getApplyType()); entity.setApplyStatus(param.getApplyStatus()); diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java index ca0c9bb..e5234d5 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java @@ -60,6 +60,18 @@ public class ShopDealerApply implements Serializable { @Schema(description = "详细地址") private String address; + @Schema(description = "社区") + private String community; + + @Schema(description = "楼栋号") + private String buildingNumber; + + @Schema(description = "单元号") + private String unitNumber; + + @Schema(description = "房号") + private String roomNumber; + @Schema(description = "佣金比例") @TableField(exist = false) private BigDecimal rate; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml index 809e68a..13ac6b9 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml @@ -25,6 +25,18 @@ AND a.mobile LIKE CONCAT('%', #{param.mobile}, '%') + + AND a.community LIKE CONCAT('%', #{param.community}, '%') + + + AND a.building_number = #{param.buildingNumber} + + + AND a.unit_number = #{param.unitNumber} + + + AND a.room_number = #{param.roomNumber} + AND a.dealer_name LIKE CONCAT('%', #{param.dealerName}, '%') diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyImportParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyImportParam.java index 50ff384..b1b3b57 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyImportParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyImportParam.java @@ -40,6 +40,18 @@ public class ShopDealerApplyImportParam implements Serializable { @Excel(name = "详细地址") private String address; + @Excel(name = "社区") + private String community; + + @Excel(name = "楼栋号") + private String buildingNumber; + + @Excel(name = "单元号") + private String unitNumber; + + @Excel(name = "房号") + private String roomNumber; + @Excel(name = "推荐人用户ID") private Integer refereeId; diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java index fb4211a..f6adeab 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java @@ -40,6 +40,18 @@ public class ShopDealerApplyParam extends BaseParam { @Schema(description = "手机号") private String mobile; + @Schema(description = "社区") + private String community; + + @Schema(description = "楼栋号") + private String buildingNumber; + + @Schema(description = "单元号") + private String unitNumber; + + @Schema(description = "房号") + private String roomNumber; + @Schema(description = "推荐人用户ID") @QueryField(type = QueryType.EQ) private Integer refereeId;