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 5f76a439..11009240 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 @@ -67,6 +67,10 @@ public class ContractManageVO extends ContractManage { @Schema(description = "生效类型筛选") private String effectiveType; + @TableField(exist = false) + @Schema(description = "客商筛选:按甲方/乙方名称模糊匹配(丙方未落库,不参与)") + private String partyName; + @TableField(exist = false) @Schema(description = "创建人姓名") private String createUserName; 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 3d2ac007..5f20782e 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 @@ -619,6 +619,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())