diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java index 7b1e215b..46002d22 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java @@ -68,7 +68,7 @@ public class ContractManageVO extends ContractManage { private String effectiveType; @TableField(exist = false) - @Schema(description = "客商(匹配甲/乙/丙方)") + @Schema(description = "客商筛选:按甲方/乙方名称模糊匹配(丙方未落库,不参与)") private String partyName; @TableField(exist = false) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java index 2930cca1..6875a766 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java @@ -691,6 +691,10 @@ public class ContractManageServiceImpl extends BaseServiceImpl wrapper + .like(ContractManage::getPartyA, contractManage.getPartyName()) + .or().like(ContractManage::getPartyB, contractManage.getPartyName())) .like(Func.isNotEmpty(contractManage.getProjectName()) && Func.isEmpty(contractManage.getProjectId()), ContractManage::getProjectName, contractManage.getProjectName()) .like(Func.isNotEmpty(contractManage.getOrganizationName()), ContractManage::getOrganizationName, contractManage.getOrganizationName())